more controlled release process. if is tag, push that version. if is tag and is latest version (set in travis env) push both the version, and latest tags

Author: ddavison

.travis.yml

@@ -8,7 +8,7 @@ language: bash
 
 before_install:
   - docker info
-  - make build
+  - VERSION="$TRAVIS_BRANCH" make build
   - docker build -t test:local ./Test
 
 script:
@@ -18,5 +18,9 @@ script:
 after_success:
   - if [ "$TRAVIS_TAG" != "" ]; then
     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
-    make release;
+    if [ "$TRAVIS_TAG" == "$LATEST" ]; then
+    VERSION="$TRAVIS_TAG" make tag_latest;
+    VERSION="latest" make release;
+    fi
+    VERSION="$TRAVIS_TAG" make release;
     fi

Makefile

@@ -97,7 +97,7 @@ tag_latest:
 	docker tag $(NAME)/standalone-chrome-debug:$(VERSION) $(NAME)/standalone-chrome-debug:latest
 	docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:latest
 
-release: tag_latest
+release:
 	@if ! docker images $(NAME)/base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/hub | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/hub version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
@@ -121,7 +121,6 @@ release: tag_latest
 	docker push $(NAME)/standalone-firefox
 	docker push $(NAME)/standalone-chrome-debug
 	docker push $(NAME)/standalone-firefox-debug
-	@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"
 
 test:
 	./test.sh