Переглянути джерело

Merge pull request #11064 from HJianBo/docker-build-with-extra-deps

build: fix the EXTRA_DEPS not working in workflows
JianBo He 2 роки тому
батько
коміт
70624fabeb
1 змінених файлів з 6 додано та 0 видалено
  1. 6 0
      .github/workflows/build_and_push_docker_images.yaml

+ 6 - 0
.github/workflows/build_and_push_docker_images.yaml

@@ -167,9 +167,14 @@ jobs:
           img_suffix="-elixir"
           img_suffix="-elixir"
           extra_labels="org.opencontainers.image.elixir.version=${{ matrix.elixir }}"
           extra_labels="org.opencontainers.image.elixir.version=${{ matrix.elixir }}"
         fi
         fi
+        extra_deps=
+        if [[ "${{ matrix.profile }}" = *enterprise* ]]; then
+          extra_deps='libsasl2-2'
+        fi
 
 
         echo "img_suffix=$img_suffix" >> $GITHUB_OUTPUT
         echo "img_suffix=$img_suffix" >> $GITHUB_OUTPUT
         echo "extra_labels=$extra_labels" >> $GITHUB_OUTPUT
         echo "extra_labels=$extra_labels" >> $GITHUB_OUTPUT
+        echo "extra_deps=$extra_deps" >> $GITHUB_OUTPUT
 
 
     - uses: docker/metadata-action@v4
     - uses: docker/metadata-action@v4
       id: meta
       id: meta
@@ -196,5 +201,6 @@ jobs:
         labels: ${{ steps.meta.outputs.labels }}
         labels: ${{ steps.meta.outputs.labels }}
         build-args: |
         build-args: |
           EMQX_NAME=${{ matrix.profile }}${{ steps.pre-meta.outputs.img_suffix }}
           EMQX_NAME=${{ matrix.profile }}${{ steps.pre-meta.outputs.img_suffix }}
+          EXTRA_DEPS=${{ steps.pre-meta.outputs.extra_deps }}
         file: source/${{ matrix.os[2] }}
         file: source/${{ matrix.os[2] }}
         context: source
         context: source