Push image & buildcache separately, then import image later

MaMpf-HD · Feb 1, 2025 · e254e18 · e254e18
1 parent 10d36de
commit e254e18
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -63,10 +63,9 @@ jobs:
           docker buildx bake
           --allow=fs.read=/home/runner/work/mampf/mampf
           -f ./docker-compose.yml -f ./docker-compose.cicd.build.yml
-          --set mampf.output=type=registry
-          --set mampf.tags=ghcr.io/mampf-hd/mampftest:cache
-          --set mampf.cache-from=type=registry,ref=ghcr.io/mampf-hd/mampftest:cache
-          --set mampf.cache-to=type=registry,ref=ghcr.io/mampf-hd/mampftest:cache,mode=max,image-manifest=true
+          --set mampf.output=type=image,name=ghcr.io/mampf-hd/mampftest:image,push=true
+          --set mampf.cache-from=type=registry,ref=ghcr.io/mampf-hd/mampftest:buildcache
+          --set mampf.cache-to=type=registry,ref=ghcr.io/mampf-hd/mampftest:buildcache,mode=max
 
   unit-tests:
     name: Unit tests
@@ -89,7 +88,7 @@ jobs:
       - name: Pull MaMpf image (from GHCR)
         working-directory: docker/test
         run: >
-          docker pull ghcr.io/mampf-hd/mampftest:cache
+          docker pull ghcr.io/mampf-hd/mampftest:image
 
       - name: Run unit tests
         working-directory: docker/test
@@ -128,7 +127,7 @@ jobs:
       - name: Pull MaMpf image (from GHCR)
         working-directory: docker/test
         run: >
-          docker pull ghcr.io/mampf-hd/mampftest:cache
+          docker pull ghcr.io/mampf-hd/mampftest:image
 
       - name: Run Cypress tests
         working-directory: docker/test

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -111,6 +111,7 @@
     "cSpell.words": [
         "activerecord",
         "ajax",
+        "buildcache",
         "cicd",
         "commontator",
         "cospeaker",

diff --git a/docker/test/docker-compose.cicd.build.yml b/docker/test/docker-compose.cicd.build.yml
@@ -5,4 +5,4 @@ services:
       dockerfile: docker/development/Dockerfile
       args:
         IN_CI_CD: "true"      
-    image: mampftest:cache
+    image: mampftest:image
diff --git a/docker/test/docker-compose.cicd.yml b/docker/test/docker-compose.cicd.yml
@@ -1,6 +1,6 @@
 services:
   mampf:
-    image: ghcr.io/mampf-hd/mampftest:cache
+    image: ghcr.io/mampf-hd/mampftest:image
     environment:
       RAILS_ENV: test
       IN_CI_CD_WEBPACKER: "true"