From 009f04929d4d3166028f3176979d31e0f14c3964 Mon Sep 17 00:00:00 2001
From: Vincent Prins <vincent.prins@ivdnt.org>
Date: Tue, 4 Jun 2024 13:42:18 +0200
Subject: [PATCH] Use path from repo root for build-and-push

In the end, this script is only mean for github actions anyway.
---
 .github/workflows/publish-dev.yml  | 2 +-
 .github/workflows/publish-prod.yml | 7 ++++---
 scripts/build-and-push-all.sh      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml
index 878c6aa..8b57f87 100644
--- a/.github/workflows/publish-dev.yml
+++ b/.github/workflows/publish-dev.yml
@@ -28,6 +28,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        run: cd scripts && ./build-and-push-all.sh
+        run: ./scripts/build-and-push-all.sh
         env:
           VERSION_LABEL: dev
diff --git a/.github/workflows/publish-prod.yml b/.github/workflows/publish-prod.yml
index a2db155..f29aab9 100644
--- a/.github/workflows/publish-prod.yml
+++ b/.github/workflows/publish-prod.yml
@@ -1,8 +1,9 @@
 name: Prod images to docker
 
 on:
-  tags: 
-    - '[0-9]+.[0-9]+.[0-9]+'
+  push:
+    tags: 
+      - '[0-9]+.[0-9]+.[0-9]+'
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -28,6 +29,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        run: cd scripts && ./build-and-push-all.sh
+        run: ./scripts/build-and-push-all.sh
         env:
           VERSION_LABEL: latest
diff --git a/scripts/build-and-push-all.sh b/scripts/build-and-push-all.sh
index 3fe3f31..0030e4b 100755
--- a/scripts/build-and-push-all.sh
+++ b/scripts/build-and-push-all.sh
@@ -1,7 +1,7 @@
 # Set the default label
 : ${VERSION_LABEL:=dev}
 
-./build-all.sh
+./scripts/build-all.sh
 
 echo "Will push galahad images with version <$VERSION_LABEL>. Set VERSION_LABEL to override this."