From db829f843d8067e4a79a2453318bdf124c7f482d Mon Sep 17 00:00:00 2001
From: Robin Straub <robin@brumaire.io>
Date: Sun, 21 May 2023 14:40:01 +0200
Subject: [PATCH 1/5] fix: invalid docker path

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0f61c91f7e9b..723c1b65d7c9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,6 +4,9 @@ on:
   release:
     types:
       - created
+  push:
+    branches:
+      - ci/add-docker-build-action
 
 jobs:
   build-and-push:
@@ -28,7 +31,7 @@ jobs:
         with:
           context: .
           push: true
-          file: infra/docker/Dockerfile
+          file: docker/Dockerfile
           tags: >
-            ghcr.io/${{ github.repository }}:latest,
-            ghcr.io/${{github.repository }}:${{ github.event.release.tag_name }}
+            ghcr.io/${{ github.repository }}:latest
+#            ghcr.io/${{github.repository }}:${{ github.event.release.tag_name }}

From 7ec124bbc5ec5884e132c9b8c2f816276f11ee6a Mon Sep 17 00:00:00 2001
From: Robin Straub <robin@brumaire.io>
Date: Sun, 21 May 2023 14:42:57 +0200
Subject: [PATCH 2/5] ci: update branch trigger name

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 723c1b65d7c9..88008ac41634 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
       - created
   push:
     branches:
-      - ci/add-docker-build-action
+      - ci/fix-dockerfile-path
 
 jobs:
   build-and-push:

From 4634b67d6aac6125dd9001abeb8f7c7b8761a17d Mon Sep 17 00:00:00 2001
From: Robin Straub <robin@brumaire.io>
Date: Sun, 21 May 2023 14:45:13 +0200
Subject: [PATCH 3/5] ci: add a job trigger to test the workflow

---
 .github/workflows/docker.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 88008ac41634..ed58cf481c60 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,12 +1,11 @@
 name: Build and Push Docker Image
 
-on:
-  release:
-    types:
-      - created
-  push:
-    branches:
-      - ci/fix-dockerfile-path
+#on:
+#  release:
+#    types:
+#      - created
+
+on: [pull_request]
 
 jobs:
   build-and-push:

From 84980c3a667a5c03015d69b803a2874fd8474d1f Mon Sep 17 00:00:00 2001
From: Robin Straub <robin@brumaire.io>
Date: Mon, 22 May 2023 14:22:55 +0200
Subject: [PATCH 4/5] ci: revert job trigger to release type

---
 .github/workflows/docker.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ed58cf481c60..f35a91db9be4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,11 +1,9 @@
 name: Build and Push Docker Image
 
-#on:
-#  release:
-#    types:
-#      - created
-
-on: [pull_request]
+on:
+  release:
+    types:
+      - created
 
 jobs:
   build-and-push:

From 0fe94fcc0e818e01873a8bea49fb826969bdde45 Mon Sep 17 00:00:00 2001
From: Robin Straub <robin@brumaire.io>
Date: Mon, 22 May 2023 14:28:02 +0200
Subject: [PATCH 5/5] ci: revert image tag

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f35a91db9be4..df44490c6626 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -30,5 +30,5 @@ jobs:
           push: true
           file: docker/Dockerfile
           tags: >
-            ghcr.io/${{ github.repository }}:latest
-#            ghcr.io/${{github.repository }}:${{ github.event.release.tag_name }}
+            ghcr.io/${{ github.repository }}:latest,
+            ghcr.io/${{github.repository }}:${{ github.event.release.tag_name }}