From 9e7e51711fd1d1353a08a8dc43bbce7a4af470ab Mon Sep 17 00:00:00 2001
From: Seth Simmons <ssimmons2@theark.cloud>
Date: Wed, 24 Mar 2021 13:06:09 -0400
Subject: [PATCH] Migrate caching to Registry

---
 .github/workflows/update-base-image.yml    | 22 +++-------------------
 .github/workflows/update-image-on-push.yml | 20 ++------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/update-base-image.yml b/.github/workflows/update-base-image.yml
index 663b0f0..e9b9e65 100644
--- a/.github/workflows/update-base-image.yml
+++ b/.github/workflows/update-base-image.yml
@@ -1,4 +1,4 @@
-name: "Update Image and Push to Github Packages and Docker Hub"
+name: "Update Image and Push to Github Packages and Docker Hub Daily"
 on:
   schedule:
     - cron: "0 12 * * *" # Run every day at noon.
@@ -11,14 +11,6 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      -
-        name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
       -
         name: Login to GitHub Container Registry
         uses: docker/login-action@v1 
@@ -49,16 +41,8 @@ jobs:
             ghcr.io/sethsimmons/simple-monerod:${{ steps.get_tag.outputs.tag }}
             sethsimmons/simple-monerod:latest
             sethsimmons/simple-monerod:${{ steps.get_tag.outputs.tag }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-      -
-        # 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
+          cache-from: type=registry,ref=sethsimmons/simple-monerod:latest
+          cache-to: type=inline
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file
diff --git a/.github/workflows/update-image-on-push.yml b/.github/workflows/update-image-on-push.yml
index 938ab96..5ed3e62 100644
--- a/.github/workflows/update-image-on-push.yml
+++ b/.github/workflows/update-image-on-push.yml
@@ -12,14 +12,6 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      -
-        name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
       -
         name: Login to GitHub Container Registry
         uses: docker/login-action@v1 
@@ -50,16 +42,8 @@ jobs:
             ghcr.io/sethsimmons/simple-monerod:${{ steps.get_tag.outputs.tag }}
             sethsimmons/simple-monerod:latest
             sethsimmons/simple-monerod:${{ steps.get_tag.outputs.tag }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-      -
-        # 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
+          cache-from: type=registry,ref=sethsimmons/simple-monerod:latest
+          cache-to: type=inline
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file