From 90429c9d2d04421240c6dbc20be612d9bb50cb1d Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Fri, 14 Oct 2016 10:48:34 +0530
Subject: [PATCH 1/2] circle.yml: renamed cache build to `_`

---
 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 250938d786b3..be7e53ff702d 100644
--- a/bitnami/apache/circle.yml
+++ b/bitnami/apache/circle.yml
@@ -10,7 +10,7 @@ dependencies:
   override:
   - docker info
   - gcloud version
-  - docker pull $DOCKER_PROJECT/$IMAGE_NAME:cache-reload || true
+  - docker pull $DOCKER_PROJECT/$IMAGE_NAME:_ || true
 
 test:
   override:
@@ -23,8 +23,8 @@ deployment:
     - >
       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:cache-reload .
-        docker push $DOCKER_PROJECT/$IMAGE_NAME:cache-reload
+        docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:_ .
+        docker push $DOCKER_PROJECT/$IMAGE_NAME:_
       fi
   release:
     tag: /^[0-9]+(\.[0-9]+)*([^\n])*/

From 70d2f142f4d265587b8eed2537a845c9eb49f706 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Fri, 14 Oct 2016 10:48:35 +0530
Subject: [PATCH 2/2] circle.yml: simplify deployment tag selection

---
 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 be7e53ff702d..ca9769b900d4 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]+(\.[0-9]+)*([^\n])*/
+    tag: /^[0-9.]+/
     commands:
     - >
       if [ -n $DOCKER_PASS ]; then