From b1acc6d441ba94dfe55faaaafbb62ee546c9e52a Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Thu, 13 Oct 2016 14:32:17 +0530
Subject: [PATCH] replace development build with a cache build

---
 bitnami/odoo/circle.yml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/bitnami/odoo/circle.yml b/bitnami/odoo/circle.yml
index 64464935752e..74bda3e6117e 100644
--- a/bitnami/odoo/circle.yml
+++ b/bitnami/odoo/circle.yml
@@ -10,32 +10,24 @@ dependencies:
   override:
   - docker info
   - gcloud version
-  - docker pull $DOCKER_PROJECT/$IMAGE_NAME:development || true
+  - docker pull $DOCKER_PROJECT/$IMAGE_NAME:cache-reload || true
 
 test:
   override:
   - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_BUILD_NUM .
 
 deployment:
-  development:
+  cache:
     branch: master
     commands:
     - >
       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:development .
-        docker push $DOCKER_PROJECT/$IMAGE_NAME:development
-      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
-        gcloud config set project $GCLOUD_PROJECT
-        docker tag $DOCKER_PROJECT/$IMAGE_NAME:development gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:development
-        gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:development
+        docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:cache-reload .
+        docker push $DOCKER_PROJECT/$IMAGE_NAME:cache-reload
       fi
   release:
-    tag: /^[0-9]+(\.[0-9]+)*-r[0-9]*/
+    tag: /^[0-9]+(\.[0-9]+)*([^\n])*/
     commands:
     - >
       if [ -n $DOCKER_PASS ]; then
@@ -49,7 +41,6 @@ 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
-        gcloud config set project $GCLOUD_PROJECT
         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
         gcloud docker -- push gcr.io/$GCLOUD_PROJECT/$IMAGE_NAME:$CIRCLE_TAG