From 2b159372a9e41d8791151d64d415f54a196b1aa1 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Fri, 14 Apr 2017 14:12:55 -0700
Subject: [PATCH 1/3] removed dead line

---
 docker-run.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-run.sh b/docker-run.sh
index 6e70a77b..088a9f8f 100644
--- a/docker-run.sh
+++ b/docker-run.sh
@@ -42,5 +42,4 @@ if [[ -n "$VALIDATOR_URL" ]]; then
   sed -i "s|\(url: url,.*\)|\1\n        validatorUrl: \"${VALIDATOR_URL}\",|g" $INDEX_FILE
 fi
 
-#exec http-server -p $PORT $*
 exec nginx -g 'daemon off;'
\ No newline at end of file

From 74008954c314db9aa7878540f1991741807f6d19 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Fri, 14 Apr 2017 14:13:11 -0700
Subject: [PATCH 2/3] update tag logic to `latest` and `unstable`

---
 .travis.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 22efff3d..ae71a464 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,11 +23,18 @@ deploy:
 after_success:
   - if [ $DOCKER_HUB_USERNAME ]; then 
       docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD;
+
+      if [ ! -z "$TRAVIS_TAG" ]; then
+        DOCKER_IMAGE_TAG=$TRAVIS_TAG;
+      else
+        DOCKER_IMAGE_TAG=unstable;
+      fi;
       docker build -t $DOCKER_IMAGE_NAME .;
       if [ ! -z "$TRAVIS_TAG" ]; then
-        docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG;
-      fi;
-      if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
-        docker push $DOCKER_IMAGE_NAME;
+        docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$TRAVIS_TAG;
+        docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:latest;
+      else
+        docker tag $DOCKER_IMAGE_NAME:unstable $DOCKER_IMAGE_NAME:$unstable;
       fi;
     fi;
+

From 205197d04fb4a695953d47a314a2d376cbbf3cdb Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Fri, 14 Apr 2017 14:19:52 -0700
Subject: [PATCH 3/3] fixed variable

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ae71a464..b7a7d35e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ after_success:
         docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$TRAVIS_TAG;
         docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:latest;
       else
-        docker tag $DOCKER_IMAGE_NAME:unstable $DOCKER_IMAGE_NAME:$unstable;
+        docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:unstable;
       fi;
     fi;