From 92021bfa0e340e1f3b5a59e7da029e721e604186 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 2 Aug 2021 16:06:54 +0300 Subject: [PATCH] checkout shared first --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 1 + bamboo-specs/src/main/resources/scripts/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 3b61bf127..a44b3bd49 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -78,6 +78,7 @@ public class PlanSpec { // Build new ScriptTask().description("Build") .location(ScriptTaskProperties.Location.FILE) + .workingSubdirectory("redaction-ui") .fileFromPath("redaction-ui/bamboo-specs/src/main/resources/scripts/build.sh") .environmentVariables( "PROJECT=\"" + project + "\" " + diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 1f9ed74ae..aac051389 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -3,9 +3,9 @@ set -e imageName="nexus.iqser.com:5001/red/$PROJECT" -dockerfileLocation="redaction-ui/docker/$PROJECT/Dockerfile" +dockerfileLocation="docker/$PROJECT/Dockerfile" -mv common-ui redaction-ui/lib/ +mv ../common-ui ./lib/ echo "On branch $bamboo_planRepository_branchName building project $PROJECT" # shellcheck disable=SC2154