From db5220482a52191d0754850cee6e462f3f1059e5 Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Tue, 31 Dec 2024 21:22:04 +0800
Subject: [PATCH] attempt to fix the docker build cache for arch builder image

---
 .gitea/workflows/build-arch-builder.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/build-arch-builder.yaml b/.gitea/workflows/build-arch-builder.yaml
index 8af4b5c..ba13c66 100644
--- a/.gitea/workflows/build-arch-builder.yaml
+++ b/.gitea/workflows/build-arch-builder.yaml
@@ -31,8 +31,8 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:base"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:base-buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:base-buildx-cache          
           target: base
       -
         name: Build and push arch-builder kernel images
@@ -44,8 +44,8 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:kernel"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:kernel-buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:kernel-buildx-cache          
           target: kernel
       -
         name: Build and push arch-builder rust images
@@ -57,8 +57,8 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:rust"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-buildx-cache          
           target: rust
       -
         name: Build and push arch-builder rust full images
@@ -70,8 +70,8 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:rust-full"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-buildx-cache          
           target: rust-full
       -
         name: Build and push arch-builder rust full rootless images
@@ -84,8 +84,8 @@ jobs:
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:rust-full-rootless"
             "gitea.woggioni.net/woggioni/arch-builder:latest"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-rootless-buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-rootless-buildx-cache          
           target: rust-full-rootless
       -
         name: Build and push arch-builder gitea_act_runner images
@@ -97,6 +97,6 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner"
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:buildx-cache          
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner-buildx-cache
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner-buildx-cache          
           target: gitea_act_runner