yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

build: fix the EXTRA_DEPS not working in workflows
This commit is contained in:
JianBo He 2023-06-16 00:17:18 +08:00 committed by GitHub
parent 9b56f116f4 5f9bd5e4c9
commit 70624fabeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_and_push_docker_images.yaml vendored
View File

@ -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