Pipeline improvements

schubergphilis · Jun 12, 2024 · 12ab568 · 12ab568
1 parent e2a6419
commit 12ab568
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -70,6 +70,11 @@ jobs:
     strategy:
       matrix:
         platforms: ${{ fromJSON(needs.pre-ci.outputs.platforms) }}
+    permissions:
+      attestations: write
+      contents: read
+      id-token: write
+      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -80,6 +85,13 @@ jobs:
           type: container
           job: ci
 
+      - name: Login to GitHub Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.PROJECT_DOCKER_HOST }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build
         env:
           PROJECT_DOCKER_PLATFORMS: ${{ matrix.platforms }}

diff --git a/Makefile b/Makefile
@@ -70,8 +70,8 @@ build:
 			--build-arg DEFAULT_USER_SECONDARY_GROUPS="$(DEFAULT_USER_SECONDARY_GROUPS)" \
 			--build-arg DEFAULT_USER_SHELL="$(DEFAULT_USER_SHELL)" \
 			--build-arg DEFAULT_USER="$(DEFAULT_USER)" \
-			--cache-from type=gha \
-          	--cache-to type=gha,mode=max \
+			--cache-from "type=$(PROJECT_DOCKER_CACHE_BACKEND)" \
+			--cache-to "type=$(PROJECT_DOCKER_CACHE_BACKEND),mode=max" \
 			--file "$(SOURCE_DIR)/Dockerfile" \
 			--platform "$$platform" \
 			--tag "$(PROJECT_NAME):$(PROJECT_VERSION)-$$arch" \