diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 850f062..e7fa903 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -177,7 +177,6 @@ jobs: ELIXIR_VERSION=${{ matrix.elixir }} BUILD_WITHOUT_QUIC=1 EMQTT_BENCH_VERSION=0.4.5 - LUX_VERSION=lux-2.6 file: ./Dockerfile context: . outputs: type=image,name=${{ steps.registry.outputs.image }},push-by-digest=true,name-canonical=true,push=true diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d0f7c65..3eb7e9e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -124,7 +124,6 @@ jobs: ELIXIR_VERSION=${{ matrix.elixir }} BUILD_WITHOUT_QUIC=${{ startsWith(matrix.otp, '24') && 1 || '' }} EMQTT_BENCH_VERSION=${{ startsWith(matrix.otp, '24') && '0.4.5' || '' }} - LUX_VERSION=${{ startsWith(matrix.otp, '24') && 'lux-2.6' || '' }} file: ./Dockerfile context: . - name: All OTP Image (Rust Toolchain should be installed) diff --git a/Dockerfile b/Dockerfile index ec6c5fd..5792659 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,12 +5,11 @@ ENV EMQX_BUILDER_IMAGE=${BUILD_FROM} ENV ERL_AFLAGS="-kernel shell_history enabled" ARG BUILD_WITHOUT_QUIC=false -ARG OTP_VERSION=28.5.0.7-3 +ARG OTP_VERSION=28.5.0.7-5 ARG ELIXIR_VERSION=1.19.1 ARG RUST_VERSION=1.88.0 -ARG LUX_VERSION=lux-3.0 -COPY get-otp.sh get-zsh.sh get-elixir.sh get-rust.sh get-emqtt-bench.sh get-lux.sh / +COPY get-otp.sh get-zsh.sh get-elixir.sh get-rust.sh get-emqtt-bench.sh / RUN if [ -f /opt/rh/devtoolset-10/enable ]; then source /opt/rh/devtoolset-10/enable; fi && \ . /etc/os-release && export ID=$ID && export VERSION_ID=$VERSION_ID && \ @@ -26,8 +25,7 @@ RUN if [ -f /opt/rh/devtoolset-10/enable ]; then source /opt/rh/devtoolset-10/en /get-elixir.sh ${ELIXIR_VERSION} && \ /get-rust.sh ${RUST_VERSION} && \ /get-emqtt-bench.sh && \ - /get-lux.sh ${LUX_VERSION} && \ - rm /get-otp.sh /get-zsh.sh /get-elixir.sh /get-emqtt-bench.sh /get-lux.sh + rm /get-otp.sh /get-zsh.sh /get-elixir.sh /get-emqtt-bench.sh WORKDIR / CMD [ "/bin/zsh" ] diff --git a/RELEASE.md b/RELEASE.md index 8a05b23..ed6ccce 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -7,5 +7,5 @@ Uncomment older releases when there is an update. + OTP-24.3.4.17-2,Elixir-1.15.7 + OTP-26.2.5.14-1,Elixir-1.15.7 + OTP-27.3.4.2-9,Elixir-1.18.3 -+ OTP-28.4.1-7,Elixir-1.19.1 -+ OTP-28.5.0.7-3,Elixir-1.19.1 ++ OTP-28.4.1-9,Elixir-1.19.1 ++ OTP-28.5.0.7-5,Elixir-1.19.1 diff --git a/get-lux.sh b/get-lux.sh deleted file mode 100755 index ddadda4..0000000 --- a/get-lux.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -xeuo pipefail - -LUX_REF="${1:-lux-3.0}" - -mkdir -p /tools -git clone --depth=1 --branch=${LUX_REF} https://github.com/hawk/lux /tools/lux -cd /tools/lux -autoconf -./configure -make -make install -cd /tools -rm -rf lux