From aa75e4ca3c2a3dfcb9c8d957295844bf744d8da1 Mon Sep 17 00:00:00 2001
From: Oleksandr Dzhychko <odzhychko@itemis.com>
Date: Fri, 12 Jan 2024 08:34:23 +0100
Subject: [PATCH] ci: update shell scripts for Docker

Make scripts more usable by executing them in the correct directory even when called from a different directory.
---
 docker-build-local-and-publish-on-ci-all.sh   | 20 ++++---------------
 .../docker-build-local-and-publish-on-ci.sh   |  2 ++
 .../docker-build-local-and-publish-on-ci.sh   |  2 ++
 .../docker-build-local-and-publish-on-ci.sh   |  2 ++
 .../docker-build-local-and-publish-on-ci.sh   |  2 ++
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/docker-build-local-and-publish-on-ci-all.sh b/docker-build-local-and-publish-on-ci-all.sh
index 11e1fbd..042a4cc 100755
--- a/docker-build-local-and-publish-on-ci-all.sh
+++ b/docker-build-local-and-publish-on-ci-all.sh
@@ -3,19 +3,7 @@
 set -e
 set -x
 
-(
- cd instances-manager
- ./docker-build-local-and-publish-on-ci.sh
-)
-(
- cd workspace-client
- ./docker-build-local-and-publish-on-ci.sh
-)
-(
- cd workspace-job
- ./docker-build-local-and-publish-on-ci.sh
-)
-(
- cd workspace-manager
- ./docker-build-local-and-publish-on-ci.sh
-)
\ No newline at end of file
+./instances-manager/docker-build-local-and-publish-on-ci.sh
+./workspace-client/docker-build-local-and-publish-on-ci.sh
+./workspace-job/docker-build-local-and-publish-on-ci.sh
+./workspace-manager/docker-build-local-and-publish-on-ci.sh
\ No newline at end of file
diff --git a/instances-manager/docker-build-local-and-publish-on-ci.sh b/instances-manager/docker-build-local-and-publish-on-ci.sh
index 479676b..df7f202 100755
--- a/instances-manager/docker-build-local-and-publish-on-ci.sh
+++ b/instances-manager/docker-build-local-and-publish-on-ci.sh
@@ -3,6 +3,8 @@
 set -e
 set -x
 
+cd "$(dirname "$0")"
+
 MODELIX_WORKSPACES_VERSION="$(cat ../workspaces-version.txt)"
 
 if [ "${CI}" = "true" ]; then
diff --git a/workspace-client/docker-build-local-and-publish-on-ci.sh b/workspace-client/docker-build-local-and-publish-on-ci.sh
index 5475b4a..f77894a 100755
--- a/workspace-client/docker-build-local-and-publish-on-ci.sh
+++ b/workspace-client/docker-build-local-and-publish-on-ci.sh
@@ -3,6 +3,8 @@
 set -e
 set -x
 
+cd "$(dirname "$0")"
+
 getProperty() {
    PROPERTY_KEY=$1
    PROPERTY_VALUE=$(grep "$PROPERTY_KEY" < ../gradle.properties | cut -d'=' -f2)
diff --git a/workspace-job/docker-build-local-and-publish-on-ci.sh b/workspace-job/docker-build-local-and-publish-on-ci.sh
index e068977..0bf5db5 100755
--- a/workspace-job/docker-build-local-and-publish-on-ci.sh
+++ b/workspace-job/docker-build-local-and-publish-on-ci.sh
@@ -3,6 +3,8 @@
 set -e
 set -x
 
+cd "$(dirname "$0")"
+
 getProperty() {
    PROPERTY_KEY=$1
    PROPERTY_VALUE=$(grep "$PROPERTY_KEY" < ../gradle.properties | cut -d'=' -f2)
diff --git a/workspace-manager/docker-build-local-and-publish-on-ci.sh b/workspace-manager/docker-build-local-and-publish-on-ci.sh
index 2200eca..62e0735 100755
--- a/workspace-manager/docker-build-local-and-publish-on-ci.sh
+++ b/workspace-manager/docker-build-local-and-publish-on-ci.sh
@@ -3,6 +3,8 @@
 set -e
 set -x
 
+cd "$(dirname "$0")"
+
 MODELIX_WORKSPACES_VERSION="$(cat ../workspaces-version.txt)"
 
 if [ "${CI}" = "true" ]; then