From 3a56476d5bfa10954e53ab7e88beb67fead4d6c3 Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 21:36:28 -0600
Subject: [PATCH 01/10] Update dockerimage.yml

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

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 723d429..41c227d 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -60,7 +60,9 @@ jobs:
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
-        run: \echo "${TAGS}" | \xargs -I {} cosign sign --yes "{}@${DIGEST}" \
+          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
+          COSIGN_PASSWORD: ""
+        run: \echo "${TAGS}" | \xargs -I {} cosign sign --key <(\echo "${COSIGN_PRIVATE_KEY}") --yes "{}@${DIGEST}" \
             -a "workflow=${{ github.workflow }}" \
             -a "repo=${{ github.repository }}" \
             -a "branch=${{ github.ref_name }}" \

From df1140f1c05a7efb18941ebbf1207277cfaaa1b3 Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 21:45:41 -0600
Subject: [PATCH 02/10] Update dockerimage.yml

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

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 41c227d..bcb38f8 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -62,7 +62,7 @@ jobs:
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
           COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
           COSIGN_PASSWORD: ""
-        run: \echo "${TAGS}" | \xargs -I {} cosign sign --key <(\echo "${COSIGN_PRIVATE_KEY}") --yes "{}@${DIGEST}" \
+        run: \echo "${TAGS}" | \xargs -I {} cosign sign --key <(\printf '%s\n' "${COSIGN_PRIVATE_KEY}") --yes "{}@${DIGEST}" \
             -a "workflow=${{ github.workflow }}" \
             -a "repo=${{ github.repository }}" \
             -a "branch=${{ github.ref_name }}" \

From 56a545494bc0b040f8a7da1550ab37ce0d7e2223 Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 22:00:53 -0600
Subject: [PATCH 03/10] Update dockerimage.yml

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

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index bcb38f8..41c227d 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -62,7 +62,7 @@ jobs:
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
           COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
           COSIGN_PASSWORD: ""
-        run: \echo "${TAGS}" | \xargs -I {} cosign sign --key <(\printf '%s\n' "${COSIGN_PRIVATE_KEY}") --yes "{}@${DIGEST}" \
+        run: \echo "${TAGS}" | \xargs -I {} cosign sign --key <(\echo "${COSIGN_PRIVATE_KEY}") --yes "{}@${DIGEST}" \
             -a "workflow=${{ github.workflow }}" \
             -a "repo=${{ github.repository }}" \
             -a "branch=${{ github.ref_name }}" \

From 7cd15bdd51dd89327e0a1d66592c37fdd15bab29 Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 22:07:12 -0600
Subject: [PATCH 04/10] Update dockerimage.yml

---
 .github/workflows/dockerimage.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 41c227d..8a08d6e 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -61,7 +61,6 @@ jobs:
           TAGS: ${{ steps.meta.outputs.tags }}
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
           COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-          COSIGN_PASSWORD: ""
         run: \echo "${TAGS}" | \xargs -I {} cosign sign --key <(\echo "${COSIGN_PRIVATE_KEY}") --yes "{}@${DIGEST}" \
             -a "workflow=${{ github.workflow }}" \
             -a "repo=${{ github.repository }}" \

From 7766cf64bc2701763ab47c2d54f47dd77659748f Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 22:11:27 -0600
Subject: [PATCH 05/10] Update dockerimage.yml

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

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 8a08d6e..50c6c62 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -61,11 +61,14 @@ jobs:
           TAGS: ${{ steps.meta.outputs.tags }}
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
           COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-        run: \echo "${TAGS}" | \xargs -I {} cosign sign --key <(\echo "${COSIGN_PRIVATE_KEY}") --yes "{}@${DIGEST}" \
+        run: |
+          \echo "${COSIGN_PRIVATE_KEY}" > cosign.key
+          \echo "${TAGS}" | \xargs -I {} cosign sign --key cosign.key --yes "{}@${DIGEST}" \
             -a "workflow=${{ github.workflow }}" \
             -a "repo=${{ github.repository }}" \
             -a "branch=${{ github.ref_name }}" \
             -a "ref=${{ github.sha }}"
+          \rm -f cosign.key
       - name: Test the Docker image
         working-directory: ${{ env.IMAGE }}
         run: docker compose -f docker-compose.test.yml run sut

From dc17ca800294e388b75d9ca03fb13425888ed7a9 Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 22:18:11 -0600
Subject: [PATCH 06/10] Update dockerimage.yml

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

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 50c6c62..e0377ce 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -62,6 +62,7 @@ jobs:
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
           COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
         run: |
+          export GPG_TTY=$(tty)
           \echo "${COSIGN_PRIVATE_KEY}" > cosign.key
           \echo "${TAGS}" | \xargs -I {} cosign sign --key cosign.key --yes "{}@${DIGEST}" \
             -a "workflow=${{ github.workflow }}" \

From 9aea48a0da7f2f7493db0ea553433fbb010829dc Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 23:01:49 -0600
Subject: [PATCH 07/10] Update dockerimage.yml

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

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index e0377ce..bfbcfbd 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -41,7 +41,7 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
       - uses: docker/login-action@v3
-        if: github.event_name != 'pull_request'
+        if: ${{ github.ref == 'refs/heads/main' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
         working-directory: ${{ env.IMAGE }}
         run: docker compose -f docker-compose.test.yml run sut
       - name: Set RELEASE
-        if: github.event_name != 'pull_request'
+        if: ${{ github.ref == 'refs/heads/main' }}
         run: |
           # shellcheck disable=SC2086
           RC="$(\grep ${IMAGE}/Dockerfile -e '^FROM' | \head -n 1 | \sed -e 's/^.*://')"

From 41c7b79400b152adbdb8260f8ba14ce81523725d Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 23:02:21 -0600
Subject: [PATCH 08/10] Update dockerrealase.yml

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

diff --git a/.github/workflows/dockerrealase.yml b/.github/workflows/dockerrealase.yml
index d36ed7e..afb178d 100644
--- a/.github/workflows/dockerrealase.yml
+++ b/.github/workflows/dockerrealase.yml
@@ -28,7 +28,7 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
       - uses: docker/login-action@v3
-        if: github.event_name != 'pull_request'
+        if: github.ref == 'refs/heads/main'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

From f1848f3043ba7dd334846a5269055da5436c1925 Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 23:03:19 -0600
Subject: [PATCH 09/10] Update dockerimage.yml

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

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index bfbcfbd..48ce584 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -41,7 +41,7 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
       - uses: docker/login-action@v3
-        if: ${{ github.ref == 'refs/heads/main' }}
+        if: github.ref == 'refs/heads/main'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -56,7 +56,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
       - name: Sign the published Docker image
-        if: ${{ github.ref == 'refs/heads/main' }}
+        if: github.ref == 'refs/heads/main'
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
@@ -74,7 +74,7 @@ jobs:
         working-directory: ${{ env.IMAGE }}
         run: docker compose -f docker-compose.test.yml run sut
       - name: Set RELEASE
-        if: ${{ github.ref == 'refs/heads/main' }}
+        if: github.ref == 'refs/heads/main'
         run: |
           # shellcheck disable=SC2086
           RC="$(\grep ${IMAGE}/Dockerfile -e '^FROM' | \head -n 1 | \sed -e 's/^.*://')"
@@ -82,7 +82,7 @@ jobs:
             \echo "RELEASE=${RC}" >> "${GITHUB_ENV}"
           fi
       - name: Trigger release
-        if: ${{ env.RELEASE != '' }}
+        if: env.RELEASE != ''
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

From 232626083ab0624f0f6d8bdf9c41c22632b0299c Mon Sep 17 00:00:00 2001
From: Thomas Leplus <thomasleplus@users.noreply.github.com>
Date: Tue, 19 Mar 2024 23:06:33 -0600
Subject: [PATCH 10/10] Update dockerimage.yml

---
 .github/workflows/dockerimage.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 48ce584..1b8d00f 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -62,7 +62,6 @@ jobs:
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
           COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
         run: |
-          export GPG_TTY=$(tty)
           \echo "${COSIGN_PRIVATE_KEY}" > cosign.key
           \echo "${TAGS}" | \xargs -I {} cosign sign --key cosign.key --yes "{}@${DIGEST}" \
             -a "workflow=${{ github.workflow }}" \