modified some logic
This commit is contained in:
parent
e9fd9be3fb
commit
ec715880e0
@ -8,8 +8,6 @@ if [[ "${BRANCH_NAME}" == "master" ]]
|
|||||||
then
|
then
|
||||||
./versions.sh minor
|
./versions.sh minor
|
||||||
version=$(jq -r '.version' < package.json)
|
version=$(jq -r '.version' < package.json)
|
||||||
echo "Preparing release properties"
|
|
||||||
echo "APP_VERSION=${version}" > version.properties
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -19,7 +17,6 @@ then
|
|||||||
version=$(jq -r '.version' < package.json)
|
version=$(jq -r '.version' < package.json)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo "Building version ${version}"
|
echo "Building version ${version}"
|
||||||
docker build -t "${imageName}":latest -f "${dockerfileLocation}" .
|
docker build -t "${imageName}":latest -f "${dockerfileLocation}" .
|
||||||
|
|
||||||
@ -29,10 +26,10 @@ then
|
|||||||
echo "Publishing Images with version ${version}"
|
echo "Publishing Images with version ${version}"
|
||||||
echo "${BAMBOO_DOWNLOAD_PASS} | docker login -u ${BAMBOO_DOWNLOAD_USER} --password-stdin nexus.iqser.com:5001"
|
echo "${BAMBOO_DOWNLOAD_PASS} | docker login -u ${BAMBOO_DOWNLOAD_USER} --password-stdin nexus.iqser.com:5001"
|
||||||
|
|
||||||
|
|
||||||
docker push "${imageName}":latest
|
docker push "${imageName}":latest
|
||||||
docker tag "${imageName}":latest "${imageName}":"${version}"
|
docker tag "${imageName}":latest "${imageName}":"${version}"
|
||||||
docker push "${imageName}":"${version}"
|
docker push "${imageName}":"${version}"
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "Not on a relevant branch ${BRANCH_NAME} ... skipping."
|
echo "Not on a relevant branch ${BRANCH_NAME} ... skipping."
|
||||||
fi
|
fi
|
||||||
|
|||||||
5
bamboo-specs/src/main/resources/scripts/set-version.properties.sh
Executable file
5
bamboo-specs/src/main/resources/scripts/set-version.properties.sh
Executable file
@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
version=$(jq -r '.version' < package.json)
|
||||||
|
echo "Preparing release properties for version ${version}"
|
||||||
|
echo "APP_VERSION=${version}" > version.properties
|
||||||
@ -1,14 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [[ "${BRANCH_NAME}" == "master" ]]
|
|
||||||
then
|
|
||||||
./versions.sh minor
|
|
||||||
echo "Updating minor version ... "
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if [[ "${BRANCH_NAME}" == release* ]]
|
|
||||||
then
|
|
||||||
./versions.sh patch
|
|
||||||
echo "Updating patch version ... "
|
|
||||||
fi
|
|
||||||
Loading…
x
Reference in New Issue
Block a user