diff --git a/Dockerfile b/Dockerfile index 15890ad..9d44579 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,20 +4,23 @@ FROM ${BUILD_FROM} ENV EMQX_BUILDER_IMAGE=${BUILD_FROM} ENV ERL_AFLAGS="-kernel shell_history enabled" -ARG OTP_VERSION=26.2.3-1 -ARG ELIXIR_VERSION=1.15.7 -ARG FDB_VERSION=7.3.27 -ARG EMQTT_BENCH_REF=0.4.17 -ARG LUX_REF=lux-2.9.1 +ARG OTP_VERSION=27.1-1 +ARG ELIXIR_VERSION=1.17.3 +ARG FDB_VERSION=7.3.43 +ARG EMQTT_BENCH_VERSION=0.4.25 +ARG LUX_VERSION=lux-3.0 COPY get-otp.sh get-zsh.sh get-elixir.sh get-fdb.sh get-emqtt-bench.sh get-lux.sh / -RUN /get-zsh.sh && \ +RUN if [ -f /opt/rh/devtoolset-10/enable ]; then source /opt/rh/devtoolset-10/enable; fi && \ + which gcc && gcc --version && \ + which g++ && g++ --version && \ + /get-zsh.sh && \ /get-otp.sh ${OTP_VERSION} && \ /get-elixir.sh ${ELIXIR_VERSION} && \ - env FDB_VERSION=${FDB_VERSION} /get-fdb.sh && \ - env EMQTT_BENCH_REF=${EMQTT_BENCH_REF} /get-emqtt-bench.sh && \ - env LUX_REF=${LUX_REF} /get-lux.sh && \ + /get-fdb.sh ${FDB_VERSION} && \ + /get-emqtt-bench.sh ${EMQTT_BENCH_VERSION} && \ + /get-lux.sh ${LUX_VERSION} && \ rm /get-otp.sh /get-zsh.sh /get-elixir.sh /get-fdb.sh /get-emqtt-bench.sh /get-lux.sh WORKDIR / diff --git a/Makefile b/Makefile index c806e85..e518ee7 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ all: $(IMAGES) .PHONY: $(IMAGES) define gen-build-image-target $1: - @docker build -t ghcr.io/emqx/emqx-builder:$1-base $1 - @docker build --build-arg BUILD_FROM=ghcr.io/emqx/emqx-builder:$1-base -t ghcr.io/emqx/emqx-builder:$1 . + @docker build . -t ghcr.io/emqx/emqx-builder:$1-base -f $1/Dockerfile --progress plain + @docker build --build-arg BUILD_FROM=ghcr.io/emqx/emqx-builder:$1-base -t ghcr.io/emqx/emqx-builder:$1 --progress plain . endef $(foreach img,$(IMAGES),$(eval $(call gen-build-image-target,$(img)))) diff --git a/get-emqtt-bench.sh b/get-emqtt-bench.sh index 5eb1c98..c2a8103 100755 --- a/get-emqtt-bench.sh +++ b/get-emqtt-bench.sh @@ -2,7 +2,7 @@ set -xeuo pipefail -VSN="${1:-0.4.17}" +VSN="${1:-0.4.25}" . /etc/os-release if [[ "${ID_LIKE:-}" =~ rhel|fedora ]]; then diff --git a/get-fdb.sh b/get-fdb.sh index 869ee17..15d2933 100755 --- a/get-fdb.sh +++ b/get-fdb.sh @@ -8,6 +8,8 @@ if [ "${ARCH}" != "x86_64" ]; then exit 0 fi +FDB_VERSION=${1:-7.3.43} + BASE_URL="https://github.com/apple/foundationdb/releases/download/${FDB_VERSION}" . /etc/os-release if [[ "${ID_LIKE:-}" =~ rhel|fedora ]]; then diff --git a/get-lux.sh b/get-lux.sh index dce9f0f..ddadda4 100755 --- a/get-lux.sh +++ b/get-lux.sh @@ -2,7 +2,7 @@ set -xeuo pipefail -LUX_REF="${LUX_REF:-lux-2.9.1}" +LUX_REF="${1:-lux-3.0}" mkdir -p /tools git clone --depth=1 --branch=${LUX_REF} https://github.com/hawk/lux /tools/lux