docker push image of branch develop

zerowhales · May 9, 2018 · d0f281e · d0f281e
1 parent 2d0c526
commit d0f281e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,4 +30,7 @@ after_success:
   - if [[ "$TRAVIS_BRANCH" == "master" ]]; then
       docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ;
       make push_image ;
+    elif [[ "$TRAVIS_BRANCH" == "develop" ]]; then
+      docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ;
+      make push_dev_image  ;
     fi
diff --git a/Makefile b/Makefile
@@ -21,13 +21,22 @@ tools:
 build: get_vendor_deps
 	go build -o build/travis ./cmd/travis
 
-IMAGE := ywonline/travis
+NAME := ywonline/travis
+TAG := $(shell git rev-parse --short=8 HEAD)
+IMAGE := ${NAME}:${TAG}
+LATEST := ${NAME}:latest
 
 docker_image:
-	docker build -t $(IMAGE) .
+	@docker build -t $(IMAGE) .
+	@docker tag ${IMAGE} ${LATEST}
+
+DEV := ${NAME}:develop
+push_dev_image:
+	@docker tag $(IMAGE) ${DEV}
+	@docker push $(DEV)
 
 push_image:
-	docker push $(IMAGE)
+	@docker push $(LATEST)
 
 print_cybermiles_logo:
 	@echo "\n\n"