Merge pull request #52 from gianarb/feature/docker-tag-commit

Build docker image every commit

.travis.yml

@@ -1,16 +1,13 @@
 language: go
 go:
   - tip
-services:
-  - docker
 script:
-  #- sudo PATH=$PATH GOPATH=$GOPATH make ci binaries
-  - make ci
+  - curl -fsSL https://get.docker.com/ | sudo sh
+  - docker login -u $DOCKER_USER -p $DOCKER_PASS
+  - make ci docker-commit-publish
 after_success:
-  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; docker login -u $DOCKER_USER -p $DOCKER_PASS
-  - export REPO=gianarb/orbiter
-  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; then docker build -f Dockerfile -t $REPO . && docker push $REPO; else echo "I only push from master branch." ; 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="
-    - secure: "FmsLv4FV8hDSOWLGMJNBZqzN4ZQHAR/3i8MUjeaU9ux9QNGBhnPnH1/wEIQ4ticVUagNpUtjcYewyOif2YNg/aVabuB+K+X9T3ULgawmehK7e4oSr8NuiqObtFlw5RQVl0M+UV/cZiR5N3SOMmCAr8v+FReL6eMZv0iqPtmmGTcnNd7zi+/QTQB7wr4Tn0v67Q7UYN+/27DDJWqRpU2JbwxiEfIa70YF7Ba+PQ9/W2Uzf3cWXP1YFTZXrFw8waDS6NnlHz91g5haI6bJPdwdGM1DXhSWr+eE75OiV4VAChrqxQIRwiupilt8xVa1zMX9qbOC6FZtl4/WWG2Q43hgTGvUyUjxy5roBy6MyKaJY4o1q/Vs6RuBoNuUPwptvMG9Dbrus1fetuV9RMHJR04TNvHOdtrfnWj93dBUThQR4/eu+yyvBJRwqw00nm2V+AK7JhPWPQ9Yt6rpJghCEZlgOl823wUhBYGRt3VShxQdPPlbpjzRbTC58M0mqGgiqoo5bpUKsXHNVAUjlpEUnnSCNnED2kWIhQ/hsKwpKQVKkz+a6NztQ61toZHLllvEXr14sGMz8btB+lU7v7uv7DvH4GEzmfIPkK0A4hDLuLBEAieZLumkJocgdLSdW2MQMC1Cb5zfo1/cm7dt1V5J181sVkWjJqwqsiJ0fILo3wtJtlc="
+    - secure: "ZiZE1QbYcePjWaO5y0zceuMTOzOVEpS/oaa1eknlaDBaIIQRxEcMIewT0ka95bPE/wxpigg7ow04YydYtXn/6wGZ7hBH5huEnDTcah1ip4pAcmS4MQ7Zs3XAP6Z0w8O7tH1jTSM7hwyZ+XY/g8UxVZu9f7l6Sm9nh7F2DVjkLLy4cp2kSvOAVq2TwWwRUKX8E7M7uG7AumBT7gHtUmzobS+dTIDSUjAixCtyxbzMnql8JEadLYGCtgPmWeJ1Mkko77KX1zYiR7BOcuRVw3Z7ZI0FP9XKJ4GBnBgZaJBSdkIE211QQg8tL0kvvekuwt4ib+li8I5MqOxurPC1DaLeMAkkDQd1VKhfJeeuziMaz0/knk+cWT0zn0vY59Bxz40u64qwmJFnWAPibZuGojRUcJRw6skRTspGiuQfXFaum8VgRBGOArp1H6l4yFv2RGrVimRssDhZyhWl8MBTExlofrdhSd9rTFRlFK2PyihMOquhRieohvvyvPlmyMyLT/cgNrrlgWbrkhGt4ZQTWhHJe+59pnIKkvgMXvxscnD4TDcgziaTUZlGJLBm84n5juOCp2KEHPWJUfEnrcwlGDhci8bt11ESiGy9LV7FiBIFiMTZVvmaiwjOlXSoQmKR4MPHk32IPjM3LZS7b3YH8bmV394tm1yV2TkyYpdh/ymoHpo="
+    - secure: "eJEKo69F66OdJiH9WlODQ5AwmU8vyZdU/6Bb669/FQaRC+hGXYcwK6rhaY305kt4Kzf9MMdDfkgsl+So7D13kerqbxXU4phkEwG/8PQ+PTG1PLfm226tMK8vCWqEbQQVYtu8dhKO1oVqv01bXQpJBEvJbdu0hemEjKkDrrssSDH/zagtUDnI+n2VQtb07olWT5/rp/qGhUELXp0aDMd7sPYlxfQgP/zM5rR3w9l/gU+V+zGNfU0PA6yl8nKmHx1YhsUCdlRECyWJQYQFgP5hnXVWZGYiScwwJWMhjDr45dT5NwVqE8Jg1l1PsZLe+jhMOyGWi03ycI/a+vO1gjxeMVcEkOdIfPkbz3ka8HR7IQHfSC1lEYM4fEyKJMCIACNU/4GZPX9kWGnRNtEEh6jpvmb+7utLbA505BZeq6lxe/Zr1k9WRs6WPLme2QQLEuvAAkMRysg/8jAOxUunlWxMGpa2evd0Xr8b4/jCWgywnQLWtgQFW8y5ACStRi94rlzl+VOsH51uuvW+otaYsGhhGuwGg4FfmWLtHVddSUJ360zRJCBjXXe7LpzlzsLbbCUQdwXt1ofC08UOIx2MRLqWGgmqPy716Gc6wJVxVzSWRhTIbKMKLnd8/JKBn+sJEApziQPC6EbqLXq5NuKKmha9bOqCu15uuYxAGMZ0Tj5/Ryw="

Makefile

@@ -1,7 +1,8 @@
 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)
 
 .PHONY: build
 build: clean $(out_binary)
@@ -17,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
@@ -32,4 +40,4 @@ vet: ## run go vet
 
 .PHONY: clean
 clean:
-	rm -Rf bin/
+	rm -Rf bin/