From d6b2b79e5db1e00819fce89c8a0addc1e3d70ca8 Mon Sep 17 00:00:00 2001
From: Teddy Knox <teddyknox@gmail.com>
Date: Thu, 9 Nov 2023 16:23:16 -0500
Subject: [PATCH] Attempt 2

---
 .github/workflows/docker-publish.yml | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 334756260b60a..a976fbf84cd5d 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,4 +1,5 @@
 name: docker
+
 on:
   push:
     tags:
@@ -22,7 +23,6 @@ jobs:
     timeout-minutes: 120
     steps:
       - name: Checkout repository
-        id: checkout
         uses: actions/checkout@v4
 
       - name: Set up QEMU
@@ -32,21 +32,8 @@ jobs:
 
       - name: Install Docker BuildX
         uses: docker/setup-buildx-action@v2
-        id: buildx
         with:
-          install: true
           version: latest
-          driver-opts: image=moby/buildkit:master
-          buildkitd-flags: --debug
-          endpoint: unix:///var/run/docker.sock
-
-      - name: Create Builder
-        uses: docker/buildx-create-action@v1
-        with:
-          use: true
-          name: mybuilder
-          driver: docker-container
-          driver-opts: network=host
           buildkitd-flags: --debug
 
       - name: Log into registry ${{ env.REGISTRY }}
@@ -58,7 +45,6 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract Docker metadata
-        id: meta
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -82,9 +68,9 @@ jobs:
           tags: ${{ steps.docker_tagging.outputs.docker_tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry
+          cache-to: type=inline
           build-args: |
             BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
\ No newline at end of file
+            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}