From 34759b64f5f3d3730b564d46df80be9396e7549b Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Wed, 9 Aug 2023 09:23:08 +0200 Subject: [PATCH] ci(docker): pass PKG_VSN to Dockerfile to avoid calling pkg-vsn.sh --- .github/workflows/build_and_push_docker_images.yaml | 1 + deploy/docker/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml index 6c5093bcb..e3c3ff722 100644 --- a/.github/workflows/build_and_push_docker_images.yaml +++ b/.github/workflows/build_and_push_docker_images.yaml @@ -178,4 +178,5 @@ jobs: build-args: | EMQX_NAME=${{ matrix.profile }}${{ steps.pre-meta.outputs.img_suffix }} EXTRA_DEPS=${{ steps.pre-meta.outputs.extra_deps }} + PKG_VSN=${{ inputs.version }} file: ${{ matrix.os[2] }} diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 5242970d2..61a143cae 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -5,6 +5,7 @@ FROM ${BUILD_FROM} AS builder COPY . /emqx ARG EMQX_NAME=emqx +ARG PKG_VSN ENV EMQX_RELUP=false RUN export PROFILE=${EMQX_NAME%%-elixir} \