build: update default otp versions

This commit is contained in:
Zaiming Shi 2021-11-15 23:02:28 +01:00
parent cace53a02b
commit a6032d5435
3 changed files with 6 additions and 4 deletions

View File

@ -1 +1 @@
erlang 23.2.7.2-emqx-2
erlang 23.3.4.9-2

6
build
View File

@ -14,6 +14,8 @@ cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")"
OTP_VSN="${OTP_VSN:-$(./scripts/get-otp-vsn.sh)}"
export OTP_VSN
EMQX_RUNNER_IMAGE='alpine:3.14'
EMQX_BUILDER="${EMQX_BUILDER:-ghcr.io/emqx/emqx-builder/4.4-1:${OTP_VSN}-${EMQX_RUNNER_IMAGE}}"
PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
export PKG_VSN
@ -134,8 +136,8 @@ make_docker() {
echo "DOCKER BUILD: docker repo -> emqx/$PROFILE "
docker build --no-cache \
--build-arg BUILD_FROM="ghcr.io/emqx/emqx-builder/4.4:${OTP:-23.3.4.8-1}-alpine3.14" \
--build-arg RUN_FROM="alpine:3.14" \
--build-arg BUILD_FROM="${EMQX_BUILDER}" \
--build-arg RUN_FROM="{EMQX_RUNNER_IMAGE}" \
--build-arg EMQX_NAME="$PROFILE" \
--tag "emqx/$PROFILE:$PKG_VSN" \
-f deploy/docker/Dockerfile .

View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4:23.3.4.8-1-alpine3.14
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-1:23.3.4.9-2-alpine3.14
ARG RUN_FROM=alpine:3.14
FROM ${BUILD_FROM} AS builder