Merge pull request #983 from balena-io/fix-circle

Fix circle deploying of images
This commit is contained in:
CameronDiver 2019-05-17 02:03:11 -07:00 committed by GitHub
commit 33dd338033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -39,10 +39,10 @@ defaults: &defaults
command: |
VERSION_TAG_NO_DEBUG=v$(jq --raw-output .version package.json)
GIT_TAG=$(git describe --tags | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' || echo "")
VERSION_TAG="${VERSION_TAG_NO_DEBUG}${DEBUG}"
if [ "${VERSION_TAG_NO_DEBUG}" = "${GIT_TAG}" ]; then
export EXTRA_TAG=$VERSION_TAG$DEBUG
export EXTRA_TAG="${VERSION_TAG}"
fi
VERSION_TAG=${VERSION_TAG_NO_DEBUG}${DEBUG}
echo "Starting build.sh"
if [ "$DOCKER_PASSWORD" != "" ]; then
docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD