From 246b638a30dfb5ede1e3c597e466de4f5c4af395 Mon Sep 17 00:00:00 2001
From: pvannierop <pim@thehyve.nl>
Date: Mon, 9 Sep 2024 13:22:52 +0200
Subject: [PATCH 1/2] Fix key name variable for release publishing action

---
 .github/workflows/main.yml    | 2 +-
 .github/workflows/release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4d0b1196a..79910fd44 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -101,7 +101,7 @@ jobs:
         env:
           OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish
+        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish
 
   # Check that the docker image builds correctly
   docker:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9a544d4d7..009f36652 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
         env:
           OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository
 
   # Build and push tagged release docker image
   docker:

From e7d6475470aafa5b5f2bcc82a75eff2c67bdbe44 Mon Sep 17 00:00:00 2001
From: pvannierop <pim@thehyve.nl>
Date: Mon, 9 Sep 2024 13:23:06 +0200
Subject: [PATCH 2/2] Fix docker compose command

---
 .github/workflows/main.yml        | 4 ++--
 .github/workflows/pre-release.yml | 4 ++--
 src/test/bash/run-prod-e2e.sh     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 79910fd44..f79e191d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -210,9 +210,9 @@ jobs:
 #        run: |
 #          cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
 #          ./gradlew -Pprod buildDocker -x test -x javadocJar
-#          docker-compose -f src/main/docker/app.yml up -d
+#          docker compose -f src/main/docker/app.yml up -d
 #          yarn run e2e-prod
-#          docker-compose -f src/main/docker/app.yml down -v
+#          docker compose -f src/main/docker/app.yml down -v
 
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index 00ac52e70..ba4e4b808 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -63,10 +63,10 @@ jobs:
         id: e2e
         run: |
           cp src/test/resources/config/keystore.p12 src/main/resources/config/keystore.p12
-          docker-compose -f src/main/docker/postgresql.yml up -d
+          docker compose -f src/main/docker/postgresql.yml up -d
           ./gradlew bootRun -Pprod -Pe2e-prod-test &>mp.log </dev/null &
           yarn run e2e-prod
-          docker-compose -f src/main/docker/postgresql.yml down -v
+          docker compose -f src/main/docker/postgresql.yml down -v
           ./gradlew --stop
 
       - name: Upload screenshots of failed e2e tests
diff --git a/src/test/bash/run-prod-e2e.sh b/src/test/bash/run-prod-e2e.sh
index 53f002c3c..c0a3c5eb3 100755
--- a/src/test/bash/run-prod-e2e.sh
+++ b/src/test/bash/run-prod-e2e.sh
@@ -9,7 +9,7 @@ cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
 cp src/test/resources/config/keystore.p12 src/main/resources/config
 
 ./gradlew bootrun -Pe2e-prod-test -x test -x javadocJar &
-docker-compose -f src/main/docker/postgresql.yml up -d # spin up production mode application
+docker compose -f src/main/docker/postgresql.yml up -d # spin up production mode application
 set +e
 
 if ./gradlew generateOpenApiSpec && yarn run e2e-prod; then
@@ -18,5 +18,5 @@ else
   EXIT_STATUS=1
 fi
 
-docker-compose -f src/main/docker/postgresql.yml down -v # clean up containers and volumes
+docker compose -f src/main/docker/postgresql.yml down -v # clean up containers and volumes
 exit $EXIT_STATUS