From d334c013880a90d91506b07b3910fd4b2542c8ef Mon Sep 17 00:00:00 2001
From: Gianluca Arbezzano <gianarb92@gmail.com>
Date: Sat, 30 Sep 2017 11:42:57 +0100
Subject: [PATCH] Pushed a new version after every commit

---
 .travis.yml | 6 ++----
 Dockerfile  | 4 ++--
 Makefile    | 9 ++++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1b4d1d..d9974e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,9 @@ services:
   - docker
 script:
   - docker login -u $DOCKER_USER -p $DOCKER_PASS
-  - make ci
-  - docker build -f Dockerfile -t gianarb/orbiter:$(git rev-parse --short=7 HEAD) .
-  - docker push gianarb/orbiter:$(git rev-parse --short=7 HEAD)
+  - make ci docker-commit-publish
 after_success:
-  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; then docker tag gianarb/orbiter:$(git rev-parse --short=7 HEAD) gianarb/orbiter . && docker push gianarb/orbiter; fi
+  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; then make docker-latest-publish; fi
 env:
   global:
     - secure: "MN7hNDnx47U9ZCg78GjEGDH5//lLfVzCKnJyPdT4jpYWM05pDB1rPrNwIPZOVuz4XT/x07Oa5M695Pkt61L+yVVfs+AUN6bYwffKWRU0T1dvXzJneB64JQeIGkqyiAHAmrjlpgzOgfB7EcmH4aEFq1HXYCqrvIgAX75D9l/T3xuRXdIzyVLzD3CZZQSZK5cFT37niofMvHoJgmBg5u8FEd2yR2M2LJGbIpXuB3UOn2yqRZHELVg12zhOwgqE+sQtqzBwirx9GObo5x4Nh7AWHIEN/K4BsxMXwZcWSySb0QxRtPpeyiItdDNr62W2MHpyEy//0sJwC5FFhsBzGfSlLpTV+YPrmaXju81JddQVyaB7l6gR3qnwrEywlLBSU3K71FJTHerq23KQV5p50JKA0oYAkKzDtaj0yJAXpFXZbXQq1cOVQidz7Suhi5ZsobI1bzWb5gELCeqCXr0aweTQXqch7Uom4qhIf6aK961F5dvUubzYcgKqbGRBp2F72rls2+9AvnQwUHnPC574sv88oTj0JrDDZoku4vBqSgNkOOICtekBNnksAZLbWasom/+ksqGyZX8qlbf1LLfhwVLqdFgWXrHggO8r8rh8i9MyON0K04hnTHsPHU8+kmbtzZwbXwnVmrJlWnlpolt5CT5XbaPpPwDxvoYsKx0WoYsmZ20="
diff --git a/Dockerfile b/Dockerfile
index 372b41b..7fe065f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.3
+FROM golang:1.8.3 as builder
 
 RUN mkdir -p /go/src/github.com/gianarb/orbiter
 ADD . /go/src/github.com/gianarb/orbiter/
@@ -11,4 +11,4 @@ COPY --from=builder /go/src/github.com/gianarb/orbiter/bin/orbiter /bin/orbiter
 
 ENTRYPOINT ["orbiter"]
 
-CMD ["orbiter", "daemon"]
+CMD ["orbiter", "daemon"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 09472dd..9d28a22 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 out_binary=bin/orbiter
-docker_image_fqdn=docker.io/gianarb/orbiter
+docker_image_fqdn=gianarb/orbiter
 PACKAGES=$(shell go list ./... | grep -v /vendor/)
 RACE=$(shell test $$(go env GOARCH) != "amd64" || (echo "-race"))
 REV ?= $$(git rev-parse --short=7 HEAD)
@@ -18,6 +18,13 @@ bin:
 docker-image:
 	docker build -t $(docker_image_fqdn):latest .
 
+docker-commit-publish: docker-image
+	docker tag $(docker_image_fqdn):latest $(docker_image_fqdn):${REV}
+	docker push $(docker_image_fqdn):${REV}
+
+docker-latest-publish:
+	docker push $(docker_image_fqdn):latest
+
 .PHONY: clean
 help: ## this help
 	awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort