JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding fix for release branch latest tag pushing (#1420)

Browse Source 
* Adding fix for release branch latest tag pushign

* Updating how we handle pushing latest branches

* Cleaning up and adding CUSTOMTAG where necessary

* Correcting comment on satellite-ui
This commit is contained in:
Philip Hutchins 2019-03-07 10:22:18 -05:00 committed by GitHub
parent e0dd5d224a
commit af0d5add06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Makefile
View File

@ -4,13 +4,15 @@ GOARCH ?= amd64
COMPOSE_PROJECT_NAME := ${TAG}-$(shell git rev-parse --abbrev-ref HEAD) COMPOSE_PROJECT_NAME := ${TAG}-$(shell git rev-parse --abbrev-ref HEAD)
BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed "s!/!-!g") BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed "s!/!-!g")
ifeq (${BRANCH},master) ifeq (${BRANCH},master)
TAG := $(shell git rev-parse --short HEAD)-go${GO_VERSION} TAG := $(shell git rev-parse --short HEAD)-go${GO_VERSION}
LATEST_TAG := latest TRACKED_BRANCH := true
LATEST_TAG := latest
else else
TAG := $(shell git rev-parse --short HEAD)-${BRANCH}-go${GO_VERSION} TAG := $(shell git rev-parse --short HEAD)-${BRANCH}-go${GO_VERSION}
ifneq (,$(findstring release-,$(BRANCH))) ifneq (,$(findstring release-,$(BRANCH)))
LATEST_TAG := ${BRANCH}-latest TRACKED_BRANCH := true
endif LATEST_TAG := ${BRANCH}-latest
endif
endif endif
CUSTOMTAG ?= CUSTOMTAG ?=
@ -123,8 +125,8 @@ gateway-image: ## Build gateway Docker image
satellite-image: ## Build satellite Docker image satellite-image: ## Build satellite Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/satellite:${TAG}${CUSTOMTAG} -f cmd/satellite/Dockerfile . ${DOCKER_BUILD} --pull=true -t storjlabs/satellite:${TAG}${CUSTOMTAG} -f cmd/satellite/Dockerfile .
.PHONY: satellite-ui-image .PHONY: satellite-ui-image
satellite-ui-image: ## Build satellite Docker image satellite-ui-image: ## Build satellite-ui Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/satellite-ui:${TAG}${CUSTOMTAG} -t storjlabs/satellite-ui:latest -f web/satellite/Dockerfile . ${DOCKER_BUILD} --pull=true -t storjlabs/satellite-ui:${TAG}${CUSTOMTAG} -f web/satellite/Dockerfile .
.PHONY: storagenode-image .PHONY: storagenode-image
storagenode-image: ## Build storagenode Docker image storagenode-image: ## Build storagenode Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/storagenode:${TAG}${CUSTOMTAG} -f cmd/storagenode/Dockerfile . ${DOCKER_BUILD} --pull=true -t storjlabs/storagenode:${TAG}${CUSTOMTAG} -f cmd/storagenode/Dockerfile .
@ -196,18 +198,20 @@ deploy: ## Update Kubernetes deployments in staging (jenkins)
.PHONY: push-images .PHONY: push-images
push-images: ## Push Docker images to Docker Hub (jenkins) push-images: ## Push Docker images to Docker Hub (jenkins)
docker tag storjlabs/satellite:${TAG} storjlabs/satellite:latest docker push storjlabs/satellite:${TAG}${CUSTOMTAG}
docker push storjlabs/satellite:${TAG} docker push storjlabs/storagenode:${TAG}${CUSTOMTAG}
docker push storjlabs/satellite:${LATEST_TAG} docker push storjlabs/uplink:${TAG}${CUSTOMTAG}
docker tag storjlabs/storagenode:${TAG} storjlabs/storagenode:latest docker push storjlabs/gateway:${TAG}${CUSTOMTAG}
docker push storjlabs/storagenode:${TAG} ifeq (${TRACKED_BRANCH},true)
docker push storjlabs/storagenode:${LATEST_TAG} docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/satellite:${LATEST_TAG}
docker tag storjlabs/uplink:${TAG} storjlabs/uplink:latest docker push storjlabs/satellite:${LATEST_TAG}
docker push storjlabs/uplink:${TAG} docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/storagenode:${LATEST_TAG}
docker push storjlabs/uplink:${LATEST_TAG} docker push storjlabs/storagenode:${LATEST_TAG}
docker tag storjlabs/gateway:${TAG} storjlabs/gateway:latest docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/uplink:${LATEST_TAG}
docker push storjlabs/gateway:${TAG} docker push storjlabs/uplink:${LATEST_TAG}
docker push storjlabs/gateway:${LATEST_TAG} docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/gateway:${LATEST_TAG}
docker push storjlabs/gateway:${LATEST_TAG}
endif
.PHONY: binaries-upload .PHONY: binaries-upload
binaries-upload: ## Upload binaries to Google Storage (jenkins) binaries-upload: ## Upload binaries to Google Storage (jenkins)
@ -223,18 +227,18 @@ binaries-clean: ## Remove all local release binaries (jenkins)
rm -rf release rm -rf release
.PHONY: clean-images .PHONY: clean-images
ifeq (${BRANCH},master) ifeq (${TRACKED_BRANCH},true)
clean-images: ## Remove Docker images from local engine clean-images: ## Remove Docker images from local engine
-docker rmi storjlabs/gateway:${TAG} storjlabs/gateway:latest -docker rmi storjlabs/gateway:${TAG}${CUSTOMTAG} storjlabs/gateway:${LATEST_TAG}
-docker rmi storjlabs/satellite:${TAG} storjlabs/satellite:latest -docker rmi storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/satellite:${LATEST_TAG}
-docker rmi storjlabs/storagenode:${TAG} storjlabs/storagenode:latest -docker rmi storjlabs/storagenode:${TAG}${CUSTOMTAG} storjlabs/storagenode:${LATEST_TAG}
-docker rmi storjlabs/uplink:${TAG} storjlabs/uplink:latest -docker rmi storjlabs/uplink:${TAG}${CUSTOMTAG} storjlabs/uplink:${LATEST_TAG}
else else
clean-images: clean-images:
-docker rmi storjlabs/gateway:${TAG} -docker rmi storjlabs/gateway:${TAG}${CUSTOMTAG}
-docker rmi storjlabs/satellite:${TAG} -docker rmi storjlabs/satellite:${TAG}${CUSTOMTAG}
-docker rmi storjlabs/storagenode:${TAG} -docker rmi storjlabs/storagenode:${TAG}${CUSTOMTAG}
-docker rmi storjlabs/uplink:${TAG} -docker rmi storjlabs/uplink:${TAG}${CUSTOMTAG}
endif endif
.PHONY: test-docker-clean .PHONY: test-docker-clean