From 36c9acee5185c5dd50e1ffd4f2120e2387ac8bc6 Mon Sep 17 00:00:00 2001
From: Manuel Bustillo <bustikiller@bustikiller.com>
Date: Sun, 29 Dec 2024 11:27:54 +0100
Subject: [PATCH 1/4] Fix location of cache-from in Docker build

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1118afa..ad4b3e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 name: Build Nginx-based docker image
 on:
   push:
-    branches:
-      - main
+    # branches:
+    #   - main
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
@@ -32,5 +32,5 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:latest
-          cache-from: type=registry,ref=user/app:latest
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:latest
           cache-to: type=inline
\ No newline at end of file

From 0594bf9456516833718c1fbb4bb6cb3578b1dfb2 Mon Sep 17 00:00:00 2001
From: Manuel Bustillo <bustikiller@bustikiller.com>
Date: Sun, 29 Dec 2024 11:34:12 +0100
Subject: [PATCH 2/4] Build and cache the intermediate stages

---
 .github/workflows/build.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad4b3e6..da0ec57 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,13 +24,22 @@ jobs:
           registry: ${{ secrets.PRIVATE_REGISTRY_HOST }}
           username: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
           password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      - name: Build and push intermediate stages
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          target: build
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:build
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:build
+          cache-to: type=inline
         
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: |
-            ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:latest
+          tags: ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:latest
           cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:latest
           cache-to: type=inline
\ No newline at end of file

From 3e0fb208e2d118164a913a1f70678a8fa75abffd Mon Sep 17 00:00:00 2001
From: Manuel Bustillo <bustikiller@bustikiller.com>
Date: Sun, 29 Dec 2024 11:37:11 +0100
Subject: [PATCH 3/4] Fix stage name and add additional stage

---
 .github/workflows/build.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index da0ec57..98a1caf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,14 +25,24 @@ jobs:
           username: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
           password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
 
-      - name: Build and push intermediate stages
+      - name: Build and push intermediate stages (deps)
         uses: docker/build-push-action@v6
         with:
           context: .
-          target: build
+          target: deps
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:build
-          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:build
+          tags: ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:deps
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:deps
+          cache-to: type=inline
+
+      - name: Build and push intermediate stages (builder)
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          target: builder
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:builder
+          cache-from: type=registry,ref=${{ secrets.PRIVATE_REGISTRY_HOST }}/${{ env.GITHUB_REPOSITORY }}:builder
           cache-to: type=inline
         
       - name: Build and push

From 1269a1a56f0afc9992a3256d4d9ff72d6f54493f Mon Sep 17 00:00:00 2001
From: Manuel Bustillo <bustikiller@bustikiller.com>
Date: Sun, 29 Dec 2024 13:10:58 +0100
Subject: [PATCH 4/4] Run docker images only on the main branch

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 98a1caf..549df8c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 name: Build Nginx-based docker image
 on:
   push:
-    # branches:
-    #   - main
+    branches:
+      - main
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true