diff options
| author | Mister_X <MisterX2000@users.noreply.github.com> | 2025-04-02 01:43:32 +0200 |
|---|---|---|
| committer | Mister_X <MisterX2000@users.noreply.github.com> | 2025-04-02 01:43:32 +0200 |
| commit | 5f3d4d7b7e0f5a6d93f4d711969719699a3f4721 (patch) | |
| tree | 0e560e3bc7082e67de74b49b674e2b486e19d404 /.github/workflows | |
| parent | 1777828f6b847fd50d7be48d32ecb152d4bdb01e (diff) | |
fix docker
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build-docker-image.yaml | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index 942f86fcc..8f7c59df6 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -19,17 +19,20 @@ jobs: strategy: fail-fast: false matrix: - include: - - tag: "" # Default Dockerfile - platforms: linux/amd64 - - tag: aarch64 - platforms: linux/arm64 - - tag: alpine - platforms: linux/amd64,linux/arm64 - - tag: archlinux - platforms: linux/amd64,linux/arm64 - - tag: armv7 - platforms: linux/arm/v7 + tag: + - '' + - alpine + # include: + # - tag: "" # Default Dockerfile + # platforms: linux/amd64 + # - tag: aarch64 + # platforms: linux/arm64 + # - tag: alpine + # platforms: linux/amd64,linux/arm64 + # - tag: archlinux + # platforms: linux/amd64,linux/arm64 + # - tag: armv7 + # platforms: linux/arm/v7 runs-on: ubuntu-latest steps: - name: Docker meta @@ -43,7 +46,7 @@ jobs: flavor: | latest=auto prefix= - suffix=${{ matrix.tag != '' && format('-{0}', matrix.tag) || '' }} + suffix=${{ matrix.tag != '' && format('-{0}', matrix.tag)}} tags: | type=schedule type=ref,event=branch @@ -71,8 +74,8 @@ jobs: uses: docker/build-push-action@v6 with: # Use "Dockerfile" if matrix.tag is empty, otherwise use "Dockerfile.{tag}" - file: docker/${{ matrix.tag == '' && 'Dockerfile' || format('Dockerfile.{0}', matrix.tag) }} - platforms: ${{ matrix.platforms }} + file: docker/Dockerfile${{ matrix.tag != '' && format('.{0}', matrix.tag) }} + platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} |