From e38236eb05b0966a86a244bd6d0a9468aecf6efb Mon Sep 17 00:00:00 2001 From: JianBo He Date: Thu, 15 Jun 2023 21:55:53 +0800 Subject: [PATCH 1/2] build: fix the EXTRA_DEPS not working in workflows --- .github/workflows/build_and_push_docker_images.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml index fcf1e5883..6e9b272e0 100644 --- a/.github/workflows/build_and_push_docker_images.yaml +++ b/.github/workflows/build_and_push_docker_images.yaml @@ -167,9 +167,14 @@ jobs: img_suffix="-elixir" extra_labels="org.opencontainers.image.elixir.version=${{ matrix.elixir }}" fi + extra_deps= + if [[ "$PROFILE" = *enterprise* ]]; then + extra_deps='libsasl2-2' + fi echo "img_suffix=$img_suffix" >> $GITHUB_OUTPUT echo "extra_labels=$extra_labels" >> $GITHUB_OUTPUT + echo "extra_deps=$extra_deps" >> $GITHUB_OUTPUT - uses: docker/metadata-action@v4 id: meta @@ -196,5 +201,6 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-args: | EMQX_NAME=${{ matrix.profile }}${{ steps.pre-meta.outputs.img_suffix }} + EXTRA_DEPS=${{ steps.pre-meta.outputs.extra_deps }} file: source/${{ matrix.os[2] }} context: source From 5f9bd5e4c9dfe62eb4264835a735b60076a9ad33 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Thu, 15 Jun 2023 23:17:04 +0800 Subject: [PATCH 2/2] chore: update .github/workflows/build_and_push_docker_images.yaml Co-authored-by: Thales Macedo Garitezi --- .github/workflows/build_and_push_docker_images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml index 6e9b272e0..3495c647b 100644 --- a/.github/workflows/build_and_push_docker_images.yaml +++ b/.github/workflows/build_and_push_docker_images.yaml @@ -168,7 +168,7 @@ jobs: extra_labels="org.opencontainers.image.elixir.version=${{ matrix.elixir }}" fi extra_deps= - if [[ "$PROFILE" = *enterprise* ]]; then + if [[ "${{ matrix.profile }}" = *enterprise* ]]; then extra_deps='libsasl2-2' fi