From 21e8497b57c2798434446ab911e66e6a84cbc38d Mon Sep 17 00:00:00 2001 From: Martin Dimitrov Date: Fri, 6 Mar 2026 11:52:17 -0800 Subject: [PATCH] add meta and tags / platform --- .gitea/workflows/docker-publish-ghcr.yaml | 14 +++++++++-- .gitea/workflows/docker-publish-private.yaml | 26 +++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/docker-publish-ghcr.yaml b/.gitea/workflows/docker-publish-ghcr.yaml index 611d082..2e1facb 100644 --- a/.gitea/workflows/docker-publish-ghcr.yaml +++ b/.gitea/workflows/docker-publish-ghcr.yaml @@ -12,6 +12,14 @@ on: image_name: required: true type: string + file: + required: false + type: string + default: 'Dockerfile' + platforms: + required: false + type: string + default: 'linux/amd64' jobs: docker: @@ -40,15 +48,17 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: # image_name should be formatted like: user/repo images: ghcr.io/${{ inputs.image_name }} - name: Build and push Docker image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . + file: ${{ inputs.file }} + platforms: ${{ inputs.platforms }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.gitea/workflows/docker-publish-private.yaml b/.gitea/workflows/docker-publish-private.yaml index e26e03c..b10c863 100644 --- a/.gitea/workflows/docker-publish-private.yaml +++ b/.gitea/workflows/docker-publish-private.yaml @@ -12,6 +12,14 @@ on: image_name: required: true type: string + file: + required: false + type: string + default: 'Dockerfile' + platforms: + required: false + type: string + default: 'linux/amd64' secrets: [] jobs: @@ -28,8 +36,18 @@ jobs: ref: ${{ inputs.ref }} token: ${{ github.token }} - - name: Build Docker image - run: docker buildx build . -t 192.168.1.150:9120/${{ inputs.image_name }}:latest + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v6 + with: + images: 192.168.1.150:9120/${{ inputs.image_name }} - - name: Push Docker Image - run: docker image push --all-tags 192.168.1.150:9120/${{ inputs.image_name }} + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: . + file: ${{ inputs.file }} + platforms: ${{ inputs.platforms }} + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }}