From 19b3a4405ac1cb378c95f85b8450717f7a149c11 Mon Sep 17 00:00:00 2001
From: GilbN <24592972+GilbN@users.noreply.github.com>
Date: Sun, 20 Mar 2022 17:36:31 +0100
Subject: [PATCH 1/4] dockerhub job

---
 .github/workflows/docker-build.yml | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 927561d3..1f0c477d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -32,4 +32,31 @@ jobs:
       if: ${{ github.ref == 'refs/heads/live_develop' }}
         run: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park:develop --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
-            docker push --all-tags ghcr.io/gilbn/theme.park:develop
+            docker push --all-tags ghcr.io/gilbn/theme.park
+  push_to_dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
+      - name: Set current date as env variable
+        id: date_time
+        run: echo ::set-output name=NOW::$(date +'%Y-%m-%dT%H:%M:%S')
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DH_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: build&push
+      if: ${{ github.ref == 'refs/heads/live' }}
+        run: |
+            docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
+            docker push ghcr.io/gilbn/theme.park
+      if: ${{ github.ref == 'refs/heads/live_develop' }}
+        run: |
+            docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag gilbn/theme.park:develop --tag gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
+            docker push --all-tags gilbn/theme.park

From e33febebe0822b52183e031461374520549be228 Mon Sep 17 00:00:00 2001
From: GilbN <24592972+GilbN@users.noreply.github.com>
Date: Sun, 20 Mar 2022 18:04:35 +0100
Subject: [PATCH 2/4] split build&push

---
 .github/workflows/docker-build.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 1f0c477d..59188951 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -25,12 +25,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GH_PAT }}
       - name: build&push
-      if: ${{ github.ref == 'refs/heads/live' }}
-        run: |
+        if1: "${{ github.ref == 'refs/heads/live' }}"
+        run1: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
             docker push ghcr.io/gilbn/theme.park
-      if: ${{ github.ref == 'refs/heads/live_develop' }}
-        run: |
+        if2: "${{ github.ref == 'refs/heads/live_develop' }}"
+        run2: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park:develop --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
             docker push --all-tags ghcr.io/gilbn/theme.park
   push_to_dockerhub:
@@ -51,12 +51,13 @@ jobs:
         with:
           username: ${{ secrets.DH_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build&push
-      if: ${{ github.ref == 'refs/heads/live' }}
+      - name: build&push live
+        if: "${{ github.ref == 'refs/heads/live' }}"
         run: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
             docker push ghcr.io/gilbn/theme.park
-      if: ${{ github.ref == 'refs/heads/live_develop' }}
+      - name: build&push dev
+        if: "${{ github.ref == 'refs/heads/live_develop' }}"
         run: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag gilbn/theme.park:develop --tag gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
             docker push --all-tags gilbn/theme.park

From 80bbcba6797881b62cccd02687682a6148377ca7 Mon Sep 17 00:00:00 2001
From: GilbN <24592972+GilbN@users.noreply.github.com>
Date: Sun, 20 Mar 2022 18:07:07 +0100
Subject: [PATCH 3/4] name fix

---
 .github/workflows/docker-build.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 59188951..34ec9524 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -24,13 +24,14 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GH_PAT }}
-      - name: build&push
-        if1: "${{ github.ref == 'refs/heads/live' }}"
-        run1: |
+      - name: build&push live
+        if: ${{ github.ref == 'refs/heads/live' }}
+        run: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
             docker push ghcr.io/gilbn/theme.park
-        if2: "${{ github.ref == 'refs/heads/live_develop' }}"
-        run2: |
+      - name: build&push dev
+        if: ${{ github.ref == 'refs/heads/live_develop' }}
+        run: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park:develop --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
             docker push --all-tags ghcr.io/gilbn/theme.park
   push_to_dockerhub:
@@ -51,13 +52,13 @@ jobs:
         with:
           username: ${{ secrets.DH_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build&push live
-        if: "${{ github.ref == 'refs/heads/live' }}"
+      - name: build&push dh live
+        if: ${{ github.ref == 'refs/heads/live' }}
         run: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
             docker push ghcr.io/gilbn/theme.park
-      - name: build&push dev
-        if: "${{ github.ref == 'refs/heads/live_develop' }}"
+      - name: build&push dh dev
+        if: ${{ github.ref == 'refs/heads/live_develop' }}
         run: |
             docker build docker/ --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag gilbn/theme.park:develop --tag gilbn/theme.park:${{ steps.get_version.outputs.VERSION }}
             docker push --all-tags gilbn/theme.park

From 275001e2153bed96f049d4e14aa7efba75670b07 Mon Sep 17 00:00:00 2001
From: GilbN <24592972+GilbN@users.noreply.github.com>
Date: Sun, 20 Mar 2022 18:13:05 +0100
Subject: [PATCH 4/4] add type published

---
 .github/workflows/docker-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 34ec9524..12aeec75 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,6 +1,7 @@
 name: docker build
 on:
   release:
+    types: [published]
     branches: 
       - live
       - live_develop