From 02fb6d1bb519a3ebe55e4a2dbb4da42199d5074b Mon Sep 17 00:00:00 2001 From: Adnan Abdulhussein Date: Fri, 14 Oct 2016 11:30:07 -0700 Subject: [PATCH 1/2] Fix CircleCI tag regex --- bitnami/apache/circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/apache/circle.yml b/bitnami/apache/circle.yml index ca9769b900d4..43c625a2bc33 100644 --- a/bitnami/apache/circle.yml +++ b/bitnami/apache/circle.yml @@ -27,7 +27,7 @@ deployment: docker push $DOCKER_PROJECT/$IMAGE_NAME:_ fi release: - tag: /^[0-9.]+/ + tag: /^[0-9].*/ commands: - > if [ -n $DOCKER_PASS ]; then From 53de9685a853b9ce610d35a363aa8a9b45fe2b26 Mon Sep 17 00:00:00 2001 From: Adnan Abdulhussein Date: Fri, 14 Oct 2016 15:20:38 -0700 Subject: [PATCH 2/2] Set origin for GCR releases --- bitnami/apache/circle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bitnami/apache/circle.yml b/bitnami/apache/circle.yml index 43c625a2bc33..1e308d33980e 100644 --- a/bitnami/apache/circle.yml +++ b/bitnami/apache/circle.yml @@ -41,8 +41,9 @@ deployment: 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 - docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG - docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:latest + 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