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

Merge branch 'circleci-test-infra'

This commit is contained in:
Sameer Naik 2016-12-22 18:55:53 +05:30
parent d182fb7b47 30daec8ca1
commit df5e3af5cc
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/dokuwiki/Dockerfile
View File

@ -1,4 +1,4 @@
FROM gcr.io/stacksmith-images/minideb:jessie-r5 FROM gcr.io/stacksmith-images/minideb:jessie-r7
MAINTAINER Bitnami <containers@bitnami.com> MAINTAINER Bitnami <containers@bitnami.com>

32
bitnami/dokuwiki/circle.yml
View File

@ -3,6 +3,8 @@ machine:
- docker - docker
environment: environment:
IMAGE_NAME: dokuwiki IMAGE_NAME: dokuwiki
CHART_NAME: dokuwiki
CHART_REPO: https://github.com/bitnami/charts
DOCKER_PROJECT: bitnami DOCKER_PROJECT: bitnami
GCLOUD_PROJECT: bitnami-containers GCLOUD_PROJECT: bitnami-containers
@ -20,34 +22,8 @@ deployment:
cache: cache:
branch: master branch: master
commands: commands:
- > - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-update-cache.sh | bash -
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: release:
tag: /^[0-9].*-r[0-9]+$/ tag: /^[0-9].*-r[0-9]+$/
commands: commands:
- > - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-release-image.sh | bash -
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
docker push $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG
docker push $DOCKER_PROJECT/$IMAGE_NAME:latest
fi
- >
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
docker build --rm=false -t gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG .
docker tag gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest
gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG
gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest
fi
- >
if [ -n "$STACKSMITH_API_KEY" ]; then
curl "https://stacksmith.bitnami.com/api/v1/components/$IMAGE_NAME/versions?api_key=$STACKSMITH_API_KEY" -H 'Content-Type: application/json' --data '{"version": "'"${CIRCLE_TAG%-r*}"'", "revision": "'"${CIRCLE_TAG#*-r}"'", "published": true}'
fi