From fc85a1d8cbed7546188ceecbdeb2d4974f518f85 Mon Sep 17 00:00:00 2001
From: xZero707 <aleksandar@puharic.com>
Date: Wed, 5 Apr 2023 19:09:34 +0200
Subject: [PATCH] Improve caching

Inspired by: https://hackernoon.com/one-dockerfile-is-all-it-takes-how-i-fell-in-love-with-bake
---
 .github/workflows/image.yml |  3 +--
 build/docker-bake.hcl       | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 995fb6b..c56e578 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -42,5 +42,4 @@ jobs:
           files: build/docker-bake.hcl
           push: true
           set: |
-            *.cache-from=type=gha,scope=wordpress
-            *.cache-to=type=gha,scope=wordpress,mode=max
\ No newline at end of file
+            *.cache-to=
\ No newline at end of file
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index ed5bbc0..62dce62 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -20,6 +20,10 @@ target "5_9_0" {
   args = {
     WP_VERSION = "5.9.0"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=5_9_0"]
+  cache-to = ["type=gha,mode=max,scope=5_9_0"]
 }
 
 target "5_9_1" {
@@ -28,6 +32,10 @@ target "5_9_1" {
   args = {
     WP_VERSION = "5.9.1"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=5_9_1"]
+  cache-to = ["type=gha,mode=max,scope=5_9_1"]
 }
 
 target "5_9_2" {
@@ -36,6 +44,10 @@ target "5_9_2" {
   args = {
     WP_VERSION = "5.9.2"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=5_9_2"]
+  cache-to = ["type=gha,mode=max,scope=5_9_2"]
 }
 
 target "5_9_3" {
@@ -44,6 +56,10 @@ target "5_9_3" {
   args = {
     WP_VERSION = "5.9.3"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=5_9_3"]
+  cache-to = ["type=gha,mode=max,scope=5_9_3"]
 }
 
 target "6_0_0" {
@@ -52,6 +68,10 @@ target "6_0_0" {
   args = {
     WP_VERSION = "6.0.0"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=6_0_0"]
+  cache-to = ["type=gha,mode=max,scope=6_0_0"]
 }
 
 target "6_0_1" {
@@ -60,6 +80,10 @@ target "6_0_1" {
   args = {
     WP_VERSION = "6.0.1"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=6_0_1"]
+  cache-to = ["type=gha,mode=max,scope=6_0_1"]
 }
 
 target "6_0_2" {
@@ -68,6 +92,10 @@ target "6_0_2" {
   args = {
     WP_VERSION = "6.0.2"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=6_0_2"]
+  cache-to = ["type=gha,mode=max,scope=6_0_2"]
 }
 
 target "6_0_3" {
@@ -76,6 +104,10 @@ target "6_0_3" {
   args = {
     WP_VERSION = "6.0.3"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=6_0_3"]
+  cache-to = ["type=gha,mode=max,scope=6_0_3"]
 }
 
 target "6_1_0" {
@@ -84,6 +116,10 @@ target "6_1_0" {
   args = {
     WP_VERSION = "6.1.0"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=6_1_0"]
+  cache-to = ["type=gha,mode=max,scope=6_1_0"]
 }
 
 target "6_1_1" {
@@ -92,6 +128,10 @@ target "6_1_1" {
   args = {
     WP_VERSION = "6.1.1"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=6_1_1"]
+  cache-to = ["type=gha,mode=max,scope=6_1_1"]
 }
 
 target "6_2_0" {
@@ -100,4 +140,8 @@ target "6_2_0" {
   args = {
     WP_VERSION = "6.2.0"
   }
+
+  # Cache
+  cache-from = ["type=gha,scope=6_2_0"]
+  cache-to = ["type=gha,mode=max,scope=6_2_0"]
 }
\ No newline at end of file