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

Merge pull request #6627 from Rory-Z/chore/use-enterprise-dockerfile 

ci(build_packages): if it's enterprise, use Dockerfile.enterprise
This commit is contained in:
Rory Z 2022-01-05 10:37:23 +08:00 committed by GitHub
parent 8f32361311 8e88f8b9f9
commit c672d8e7a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build_packages.yaml vendored
View File

@ -382,6 +382,7 @@ jobs:
username: ${{ secrets.DOCKER_HUB_USER }} username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
- uses: docker/build-push-action@v2 - uses: docker/build-push-action@v2
if: matrix.profile != 'emqx-ee'
with: with:
push: ${{ github.event_name == 'release' && !github.event.release.prerelease }} push: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
pull: true pull: true
@ -395,6 +396,21 @@ jobs:
EMQX_NAME=${{ matrix.profile }} EMQX_NAME=${{ matrix.profile }}
file: source/deploy/docker/Dockerfile file: source/deploy/docker/Dockerfile
context: source context: source
- uses: docker/build-push-action@v2
if: matrix.profile == 'emqx-ee'
with:
push: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
pull: true
no-cache: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-4:${{ matrix.otp }}-alpine3.14
RUN_FROM=alpine:3.14
EMQX_NAME=${{ matrix.profile }}
file: source/deploy/docker/Dockerfile.enterprise
context: source
- uses: aws-actions/configure-aws-credentials@v1 - uses: aws-actions/configure-aws-credentials@v1
if: github.event_name == 'release' && !github.event.release.prerelease && matrix.profile == 'emqx' if: github.event_name == 'release' && !github.event.release.prerelease && matrix.profile == 'emqx'
with: with: