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

Fixing tabs (#1423)

Browse Source
This commit is contained in:
Philip Hutchins 2019-03-07 13:58:55 -05:00 committed by Stefan Benten
parent 193a70f0a6
commit eeb1457478
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile
View File

@ -4,15 +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}
TRACKED_BRANCH := true TRACKED_BRANCH := true
LATEST_TAG := latest 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)))
TRACKED_BRANCH := true TRACKED_BRANCH := true
LATEST_TAG := ${BRANCH}-latest LATEST_TAG := ${BRANCH}-latest
endif endif
endif endif
CUSTOMTAG ?= CUSTOMTAG ?=
@ -202,16 +202,16 @@ push-images: ## Push Docker images to Docker Hub (jenkins)
docker push storjlabs/storagenode:${TAG}${CUSTOMTAG} docker push storjlabs/storagenode:${TAG}${CUSTOMTAG}
docker push storjlabs/uplink:${TAG}${CUSTOMTAG} docker push storjlabs/uplink:${TAG}${CUSTOMTAG}
docker push storjlabs/gateway:${TAG}${CUSTOMTAG} docker push storjlabs/gateway:${TAG}${CUSTOMTAG}
ifeq (${TRACKED_BRANCH},true) ifeq (${TRACKED_BRANCH},true)
docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/satellite:${LATEST_TAG} docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/satellite:${LATEST_TAG}
docker push storjlabs/satellite:${LATEST_TAG} docker push storjlabs/satellite:${LATEST_TAG}
docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/storagenode:${LATEST_TAG} docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/storagenode:${LATEST_TAG}
docker push storjlabs/storagenode:${LATEST_TAG} docker push storjlabs/storagenode:${LATEST_TAG}
docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/uplink:${LATEST_TAG} docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/uplink:${LATEST_TAG}
docker push storjlabs/uplink:${LATEST_TAG} docker push storjlabs/uplink:${LATEST_TAG}
docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/gateway:${LATEST_TAG} docker tag storjlabs/satellite:${TAG}${CUSTOMTAG} storjlabs/gateway:${LATEST_TAG}
docker push storjlabs/gateway:${LATEST_TAG} docker push storjlabs/gateway:${LATEST_TAG}
endif endif
.PHONY: binaries-upload .PHONY: binaries-upload
binaries-upload: ## Upload binaries to Google Storage (jenkins) binaries-upload: ## Upload binaries to Google Storage (jenkins)