public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #22 from sameersbn/ci-fixes 

Ci fixes
This commit is contained in:
Sameer Naik 2016-10-17 13:47:52 +05:30 committed by GitHub
parent 875cbebe6f d8783d4ba0
commit 4eafde4255
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/owncloud/circle.yml
View File

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