diff options
Diffstat (limited to '.github/workflows/build.yml')
| -rw-r--r-- | .github/workflows/build.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 06c83b9a..c4e48704 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,8 +8,10 @@ env: DEFAULT_DOCKER_IMAGE: nicolargo/glances NODE_ENV: ${{ (contains('refs/heads/master', github.ref) || startsWith(github.ref, 'refs/tags/v')) && 'prod' || 'dev' }} PUSH_BRANCH: ${{ 'refs/heads/develop' == github.ref || 'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/v') }} - # linux/arm/v6 support following issue #2120 + # linux/arm/v7 (drop support for v6) support following issue - See issue #2120 DOCKER_PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64,linux/386 + # Ubuntu image only support linux/amd64 and linux/arm64 - See issue #2185 + DOCKER_PLATFORMS_UBUNTU: linux/amd64,linux/arm64 on: pull_request: @@ -96,7 +98,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['alpine'] + os: ['alpine', 'ubuntu'] tag: ${{ fromJson(needs.create_Docker_builds.outputs.tags) }} steps: - name: Checkout @@ -104,7 +106,7 @@ jobs: - name: Retrieve Repository Docker metadata id: docker_meta - uses: crazy-max/ghaction-docker-meta@v4.3.0 + uses: crazy-max/ghaction-docker-meta@v4.4.0 with: images: ${{ env.DEFAULT_DOCKER_IMAGE }} labels: | @@ -136,7 +138,7 @@ jobs: password: ${{ secrets.DOCKER_TOKEN }} - name: Build and push image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: push: ${{ env.PUSH_BRANCH == 'true' }} tags: "${{ env.DEFAULT_DOCKER_IMAGE }}:${{ matrix.os != 'alpine' && format('{0}-', matrix.os) || '' }}${{ matrix.tag.tag }}" @@ -144,7 +146,7 @@ jobs: CHANGING_ARG=${{ github.sha }} context: . file: "docker-files/${{ matrix.os }}.Dockerfile" - platforms: ${{env.DOCKER_PLATFORMS}} + platforms: ${{ matrix.os != 'ubuntu' && env.DOCKER_PLATFORMS || env.DOCKER_PLATFORMS_UBUNTU }} target: ${{ matrix.tag.target }} labels: ${{ steps.docker_meta.outputs.labels }} cache-from: type=local,src=/tmp/.buildx-cache |