Merge pull request #45 from bzub/image-per-commit

TravisCI: Image tag for commits, releases tagged latest, others tagge…
cloudnativelabs · Jul 7, 2017 · e0c2f7c · e0c2f7c
2 parents e5b47ed + 0a939b8
commit e0c2f7c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,16 @@ go:
   - 1.7.x
 
 after_success:
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then
-    docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
-    docker push cloudnativelabs/kube-router;
-    fi
+    - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
+    - export REPO=cloudnativelabs/kube-router;
+    - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "master"; else echo $TRAVIS_BRANCH ; fi`
+    - docker build -f Dockerfile -t $REPO:$COMMIT .
+    - docker tag $REPO:$COMMIT $REPO:$TAG
+    - if [ ! -z ${TRAVIS_TAG+x} ]; then
+          docker tag $REPO:$COMMIT $REPO:$TRAVIS_TAG;
+          docker tag $REPO:$COMMIT $REPO:latest;
+      fi
+    - docker push $REPO
 
 script:
  - make all