Pushed a new version after every commit

This commit is contained in:
Gianluca Arbezzano 2017-09-30 11:42:57 +01:00
parent 30540f726e
commit d334c01388
No known key found for this signature in database
GPG Key ID: 9505D2809E1D6180
3 changed files with 12 additions and 7 deletions

View File

@ -5,11 +5,9 @@ services:
- docker - docker
script: script:
- docker login -u $DOCKER_USER -p $DOCKER_PASS - docker login -u $DOCKER_USER -p $DOCKER_PASS
- make ci - make ci docker-commit-publish
- docker build -f Dockerfile -t gianarb/orbiter:$(git rev-parse --short=7 HEAD) .
- docker push gianarb/orbiter:$(git rev-parse --short=7 HEAD)
after_success: 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: env:
global: global:
- secure: "MN7hNDnx47U9ZCg78GjEGDH5//lLfVzCKnJyPdT4jpYWM05pDB1rPrNwIPZOVuz4XT/x07Oa5M695Pkt61L+yVVfs+AUN6bYwffKWRU0T1dvXzJneB64JQeIGkqyiAHAmrjlpgzOgfB7EcmH4aEFq1HXYCqrvIgAX75D9l/T3xuRXdIzyVLzD3CZZQSZK5cFT37niofMvHoJgmBg5u8FEd2yR2M2LJGbIpXuB3UOn2yqRZHELVg12zhOwgqE+sQtqzBwirx9GObo5x4Nh7AWHIEN/K4BsxMXwZcWSySb0QxRtPpeyiItdDNr62W2MHpyEy//0sJwC5FFhsBzGfSlLpTV+YPrmaXju81JddQVyaB7l6gR3qnwrEywlLBSU3K71FJTHerq23KQV5p50JKA0oYAkKzDtaj0yJAXpFXZbXQq1cOVQidz7Suhi5ZsobI1bzWb5gELCeqCXr0aweTQXqch7Uom4qhIf6aK961F5dvUubzYcgKqbGRBp2F72rls2+9AvnQwUHnPC574sv88oTj0JrDDZoku4vBqSgNkOOICtekBNnksAZLbWasom/+ksqGyZX8qlbf1LLfhwVLqdFgWXrHggO8r8rh8i9MyON0K04hnTHsPHU8+kmbtzZwbXwnVmrJlWnlpolt5CT5XbaPpPwDxvoYsKx0WoYsmZ20=" - secure: "MN7hNDnx47U9ZCg78GjEGDH5//lLfVzCKnJyPdT4jpYWM05pDB1rPrNwIPZOVuz4XT/x07Oa5M695Pkt61L+yVVfs+AUN6bYwffKWRU0T1dvXzJneB64JQeIGkqyiAHAmrjlpgzOgfB7EcmH4aEFq1HXYCqrvIgAX75D9l/T3xuRXdIzyVLzD3CZZQSZK5cFT37niofMvHoJgmBg5u8FEd2yR2M2LJGbIpXuB3UOn2yqRZHELVg12zhOwgqE+sQtqzBwirx9GObo5x4Nh7AWHIEN/K4BsxMXwZcWSySb0QxRtPpeyiItdDNr62W2MHpyEy//0sJwC5FFhsBzGfSlLpTV+YPrmaXju81JddQVyaB7l6gR3qnwrEywlLBSU3K71FJTHerq23KQV5p50JKA0oYAkKzDtaj0yJAXpFXZbXQq1cOVQidz7Suhi5ZsobI1bzWb5gELCeqCXr0aweTQXqch7Uom4qhIf6aK961F5dvUubzYcgKqbGRBp2F72rls2+9AvnQwUHnPC574sv88oTj0JrDDZoku4vBqSgNkOOICtekBNnksAZLbWasom/+ksqGyZX8qlbf1LLfhwVLqdFgWXrHggO8r8rh8i9MyON0K04hnTHsPHU8+kmbtzZwbXwnVmrJlWnlpolt5CT5XbaPpPwDxvoYsKx0WoYsmZ20="

View File

@ -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 RUN mkdir -p /go/src/github.com/gianarb/orbiter
ADD . /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"] ENTRYPOINT ["orbiter"]
CMD ["orbiter", "daemon"] CMD ["orbiter", "daemon"]

View File

@ -1,5 +1,5 @@
out_binary=bin/orbiter out_binary=bin/orbiter
docker_image_fqdn=docker.io/gianarb/orbiter docker_image_fqdn=gianarb/orbiter
PACKAGES=$(shell go list ./... | grep -v /vendor/) PACKAGES=$(shell go list ./... | grep -v /vendor/)
RACE=$(shell test $$(go env GOARCH) != "amd64" || (echo "-race")) RACE=$(shell test $$(go env GOARCH) != "amd64" || (echo "-race"))
REV ?= $$(git rev-parse --short=7 HEAD) REV ?= $$(git rev-parse --short=7 HEAD)
@ -18,6 +18,13 @@ bin:
docker-image: docker-image:
docker build -t $(docker_image_fqdn):latest . 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 .PHONY: clean
help: ## this help help: ## this help
awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort