diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 2932e067f..30c999f8b 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -3,8 +3,6 @@ imageName="nexus.iqser.com:5001/red/$PROJECT" dockerfileLocation="docker/$PROJECT/Dockerfile" -docker build -t "${imageName}":latest -f "${dockerfileLocation}" . - # shellcheck disable=SC2154 if [[ "${BRANCH_NAME}" == "master" ]] then @@ -22,6 +20,9 @@ then fi +echo "Building version ${version}" +docker build -t "${imageName}":latest -f "${dockerfileLocation}" . + if [[ -n ${version+z} ]] then diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index 1cb5f1f59..28662709f 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -24,7 +24,6 @@ COPY versions.sh version.sh ## Build the angular app in production mode and store the artifacts in dist folder RUN yarn lint -RUN npm version patch --no-git-tag-version RUN yarn build --prod --project=red-ui --base-href /ui/ ### STAGE 2: Setup ###