Skip to content

Commit

Permalink
feat: upgrade included apps and libraries
Browse files Browse the repository at this point in the history
OTP 27.1-1
Elixir 1.17.3
FoundationDB 7.3.43
emqtt-bench 0.4.25
Lux 3.0
  • Loading branch information
id committed Oct 11, 2024
1 parent b7862c2 commit 29dd1e4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
21 changes: 12 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 [ -f /opt/rh/devtoolset-10/enable ] && source /opt/rh/devtoolset-10/enable && \
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 /
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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))))

Expand Down
2 changes: 1 addition & 1 deletion get-emqtt-bench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions get-fdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion get-lux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 29dd1e4

Please sign in to comment.