From 69f0ff8337fcb4351391aa1549f6c8bdbe09f241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ignacio=20P=C3=A9rez?= <ignacio.perez@rootstrap.com>
Date: Mon, 20 Jan 2025 17:43:30 -0300
Subject: [PATCH] Improve Docker CI Cache (#960)

---
 .github/workflows/ci.yml | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec238678..68a4fd44 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,32 +25,16 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-${{ github.head_ref || github.ref_name }}
-            ${{ runner.os }}-buildx-main
-            ${{ runner.os }}-buildx-
-
       - name: Build prod Docker image
         uses: docker/build-push-action@v6
         with:
           push: false
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+          cache-from: |
+            type=gha,scope=${{ github.ref_name }}
+            type=gha,ref=main
+          cache-to: type=gha,scope=${{ github.ref_name }},mode=max
           file: Dockerfile
 
-      - # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-        name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
   linters:
     name: Linters
     runs-on: ubuntu-latest