From e853c12ea8cdcc740b087427a612a9add9d6c9d1 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 17 Oct 2016 13:24:21 +0530
Subject: [PATCH 1/2] ci: quote variables in bash conditional statements

---
 bitnami/apache/circle.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitnami/apache/circle.yml b/bitnami/apache/circle.yml
index 1e308d33980e..7d6f98087b74 100644
--- a/bitnami/apache/circle.yml
+++ b/bitnami/apache/circle.yml
@@ -21,7 +21,7 @@ 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:_
@@ -30,7 +30,7 @@ deployment:
     tag: /^[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

From 738a98b70034db52d3017703b8fa13ca10155645 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 17 Oct 2016 13:24:21 +0530
Subject: [PATCH 2/2] ci: enforce stricter tagging rules

---
 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 7d6f98087b74..1d1ad34bbdc6 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].*-r[0-9]+$/
     commands:
     - >
       if [ -n "$DOCKER_PASS" ]; then