Merge pull request #8 from microservices-demo/fix-push-script

Fix script

.travis.yml

@@ -12,7 +12,7 @@ script:
   - set -e
   - curl -o docker-compose.yml -sSL https://raw.githubusercontent.com/microservices-demo/microservices-demo/master/deploy/docker-compose/docker-compose.yml
   - docker-compose -f docker-compose.yml up -d
-  - docker build -t weaveworksdemos/load-test .
+  - docker build -t ${GROUP}/${REPO}:${COMMIT} .
   - docker run --rm --net loadtest_default -t weaveworksdemos/load-test -d 180 -h edge-router -c 250 -r 2500
 
 after_success:

push.sh

@@ -31,13 +31,12 @@ tag_and_push_all() {
     else
         TAG=$1
     fi
-    for m in ./docker/*/; do
-        REPO=${GROUP}/$(basename $m)
-        if [[ "$COMMIT" != "$TAG" ]]; then
-            docker tag ${REPO}:${COMMIT} ${REPO}:${TAG}
-        fi
-        push "$REPO:$TAG";
-    done;
+    DOCKER_REPO=${GROUP}/${REPO}
+    if [[ "$COMMIT" != "$TAG" ]]; then
+        echo "Tagging docker release"
+        docker tag ${DOCKER_REPO}:${COMMIT} ${DOCKER_REPO}:${TAG}
+    fi
+    push "$DOCKER_REPO:$TAG";
 }
 
 # Always push commit