Merge pull request #46 from ChronoBank/develop

Develop
Chrono-Tech · Dec 27, 2017 · 1a18a28 · 1a18a28
2 parents 6bebe09 + 4c1194d
commit 1a18a28
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,7 +32,6 @@ after_script:
   - pm2 logs --nostream
   - pm2 kill && pkill PM2
 
-
 after_success:
   - FULL_GCR_KEY="-----BEGIN PRIVATE KEY-----\n"$GCR_KEY"\n-----END PRIVATE KEY-----\n"
   - sed -i -e "s%\PWD%$FULL_GCR_KEY%g" gcregistry.json
@@ -44,10 +43,15 @@ after_success:
     elif [ "$TRAVIS_TAG" != "" ]; then
       IMAGE_TAG_NAME="develop"
     fi;
-  - docker build --quiet -t gcr.io/deep-wares-144610/middleware-ethereum:$IMAGE_TAG_NAME .
-  - docker push gcr.io/deep-wares-144610/middleware-ethereum:$IMAGE_TAG_NAME
-
-
+  - IMAGE_TAG_NAME="latest"
+  - |
+    if [ "$TRAVIS_BRANCH" == "master" ]; then
+      docker build --quiet -t gcr.io/deep-wares-144610/$TRAVIS_BRANCH/middleware-ethereum:$IMAGE_TAG_NAME .
+      docker push gcr.io/deep-wares-144610/$TRAVIS_BRANCH/middleware-ethereum:$IMAGE_TAG_NAME
+    elif [ "$TRAVIS_BRANCH" == "develop" ]; then
+      docker build --quiet -t gcr.io/deep-wares-144610/$TRAVIS_BRANCH/middleware-ethereum:$IMAGE_TAG_NAME .
+      docker push gcr.io/deep-wares-144610/$TRAVIS_BRANCH/middleware-ethereum:$IMAGE_TAG_NAME
+    fi;
 
 notifications:
   email: false