From 08d091ac23ab064a28c4a5bb61fa3ab90dd69f54 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sun, 16 Nov 2025 20:21:58 +0100 Subject: [PATCH] Use Docker bake to build targets --- .gitea/workflows/docker-kubernetes.yaml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/docker-kubernetes.yaml b/.gitea/workflows/docker-kubernetes.yaml index 1fc69b5..8245de8 100644 --- a/.gitea/workflows/docker-kubernetes.yaml +++ b/.gitea/workflows/docker-kubernetes.yaml @@ -14,9 +14,9 @@ on: description: Webhook to call after build is completed type: string outputs: - digest: + metadata: description: Digest of the build docker container - value: ${{ jobs.build.outputs.digest }} + value: ${{ jobs.build.outputs.metadata }} env: OCI_REPO: git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name}} @@ -26,7 +26,7 @@ jobs: name: Build container and manifests runs-on: ubuntu-latest outputs: - digest: ${{ steps.build.outputs.digest }} + metadata: ${{ steps.build.outputs.metadata }} steps: - name: Checkout uses: actions/checkout@v4 @@ -63,7 +63,6 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.OCI_REPO }} tags: | type=edge type=ref,event=branch @@ -71,21 +70,19 @@ jobs: type=semver,pattern=v{{major}}.{{minor}} type=semver,pattern=v{{major}} - - name: Build container + - name: Bake containers id: build - uses: docker/build-push-action@v6 + uses: docker/bake-action@v6 with: - context: . + files: | + ./docker-bake.hcl + cwd://${{ steps.meta.outputs.bake-file }} push: true sbom: true provenance: mode=max - tags: ${{ steps.meta.outputs.tags }} - annotations: ${{ steps.meta.outputs.annotations }} - cache-from: type=gha - cache-to: type=gha,mode=max - build-args: | - "RELEASE_VERSION=${{ env.RELEASE_VERSION }}" env: + TAG_BASE: ${{ env.OCI_REPO }} + RELEASE_VERSION: ${{ env.RELEASE_VERSION }} SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }} - name: Generate CRDs