ci: quote variables in bash conditional statements

This commit is contained in:
Sameer Naik
2016-10-17 13:24:46 +05:30
parent 61da09c5df
commit 934b529517

View File

@@ -10,7 +10,7 @@ dependencies:
override: override:
- docker info - docker info
- gcloud version - gcloud version
- docker pull $DOCKER_PROJECT/$IMAGE_NAME:cache-reload || true - docker pull $DOCKER_PROJECT/$IMAGE_NAME:_ || true
test: test:
override: override:
@@ -21,16 +21,16 @@ deployment:
branch: master branch: master
commands: commands:
- > - >
if [ -n $DOCKER_PASS ]; then if [ -n "$DOCKER_PASS" ]; then
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:cache-reload . docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:_ .
docker push $DOCKER_PROJECT/$IMAGE_NAME:cache-reload docker push $DOCKER_PROJECT/$IMAGE_NAME:_
fi fi
release: release:
tag: /^[0-9].*/ tag: /^[0-9].*/
commands: commands:
- > - >
if [ -n $DOCKER_PASS ]; then if [ -n "$DOCKER_PASS" ]; then
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG . docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG .
docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG $DOCKER_PROJECT/$IMAGE_NAME:latest docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG $DOCKER_PROJECT/$IMAGE_NAME:latest
@@ -38,7 +38,7 @@ deployment:
docker push $DOCKER_PROJECT/$IMAGE_NAME:latest docker push $DOCKER_PROJECT/$IMAGE_NAME:latest
fi fi
- > - >
if [ -n $GCLOUD_SERVICE_KEY ]; then if [ -n "$GCLOUD_SERVICE_KEY" ]; then
echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json
echo 'ENV BITNAMI_CONTAINER_ORIGIN=GCR' >> Dockerfile echo 'ENV BITNAMI_CONTAINER_ORIGIN=GCR' >> Dockerfile