modified some logic

This commit is contained in:
Timo 2021-05-04 14:03:06 +03:00
parent acf4835374
commit 54e53b91f4
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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 ###