From e7206cde53ab6f4b3b9177f6942398568b03610c Mon Sep 17 00:00:00 2001
From: Carles Mata <4223148+cmmata@users.noreply.github.com>
Date: Wed, 28 Dec 2022 12:34:06 +0100
Subject: [PATCH 1/4] Upgrade PHP version to 8.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cfadbec..138d019 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-fpm-bullseye
+FROM php:8.1-fpm-bullseye
 
 WORKDIR /var/www/html
 

From f6a29ea70702a1c93e0de4d22cebff5f850b1bee Mon Sep 17 00:00:00 2001
From: Carles Mata <4223148+cmmata@users.noreply.github.com>
Date: Wed, 28 Dec 2022 13:18:27 +0100
Subject: [PATCH 2/4] Execute CI on every branch

---
 .github/workflows/publish.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 62af9db..c6faa1f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: Docker Build And Push To Docker Hub
 on:
   push:
     branches:
-      - main
+      - '*'
     tags:
       - 'v*.*.*'
 
@@ -24,6 +24,8 @@ jobs:
   deployment:
     name: Deployment
     runs-on: ubuntu-latest
+    needs: build
+    if: github.ref == 'refs/heads/main'
     environment: production
     steps:      
       - name: Docker meta

From 623a8a302c372076086a9a417311fb5ec7748293 Mon Sep 17 00:00:00 2001
From: Carles Mata <4223148+cmmata@users.noreply.github.com>
Date: Thu, 29 Dec 2022 16:11:07 +0100
Subject: [PATCH 3/4] Separate workflows in build and publish

---
 .github/workflows/ci.yml      | 16 ++++++++++++++++
 .github/workflows/publish.yml | 15 ---------------
 2 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..a09f0d0
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,16 @@
+name: Build Docker image
+
+on:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build
+        uses: docker/build-push-action@v3
+        with:
+          push: false
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c6faa1f..5ff095d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -2,25 +2,10 @@ name: Docker Build And Push To Docker Hub
 
 on:
   push:
-    branches:
-      - '*'
     tags:
       - 'v*.*.*'
 
 jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout Code
-        uses: actions/checkout@v3
-        id: git_checkout
-      
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          push: false
-  
   deployment:
     name: Deployment
     runs-on: ubuntu-latest

From 9c2b8f2cd2e29b7fa0dcb6d8a044700d3ec79f88 Mon Sep 17 00:00:00 2001
From: Carles Mata <4223148+cmmata@users.noreply.github.com>
Date: Thu, 29 Dec 2022 16:20:08 +0100
Subject: [PATCH 4/4] Use tag event on metadata

---
 .github/workflows/publish.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5ff095d..0e2ff9e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -23,8 +23,7 @@ jobs:
           # generate Docker tags based on the following events/attributes
           tags: |
             type=schedule,pattern={{date 'YYYYMMDD'}}
-            type=ref,event=branch
-            type=ref,event=pr
+            type=ref,event=tag
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}