From 0845bd73b7215dbaa659a3ece945e7f98cdd5b0c Mon Sep 17 00:00:00 2001 From: Timo Date: Wed, 5 May 2021 10:04:04 +0300 Subject: [PATCH] updated build --- bamboo-specs/src/main/resources/scripts/build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 202f92128..6a64137a5 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -5,14 +5,14 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" echo "On branch $bamboo_planRepository_branchName building project $PROJECT" # shellcheck disable=SC2154 -if [[ "$BAMBOO_PLANREPOSITORY_BRANCHNAME" == "master" ]] +if [[ "$bamboo_planRepository_branchName" == "master" ]] then ./versions.sh minor version=$(jq -r '.version' < package.json) fi -if [[ "$BAMBOO_PLANREPOSITORY_BRANCHNAME" == release* ]] +if [[ "$bamboo_planRepository_branchName" == release* ]] then ./versions.sh patch version=$(jq -r '.version' < package.json) @@ -25,6 +25,8 @@ docker build -t "$imageName":latest -f "$dockerfileLocation" . if [[ -n ${version+z} ]] then + echo "APP_VERSION=${version}" > version.properties + echo "Publishing Images with version $version" echo "$bamboo_bamboo_download_pass | docker login -u $bamboo_bamboo_download_user --password-stdin nexus.iqser.com:5001" @@ -34,4 +36,6 @@ then else echo "Not on a relevant branch $BRANCH_NAME ... skipping." + + echo "APP_VERSION=$bamboo_planRepository_branchName" > version.properties fi