mirrors/kube-router
1
0
Fork 0
mirror of https://github.com/cloudnativelabs/kube-router.git synced 2025-10-12 18:31:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix image tag for branch commits

Browse Source
This commit is contained in:
bzub 2017-07-09 20:00:10 -05:00
parent db54caf788
commit d243f7d62a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -8,7 +8,8 @@ go:
branches: branches:
only: only:
- master - master
- v0.* - /^bzub-.*$/
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
env: env:
global: global:

7
Makefile
View File

@ -3,8 +3,8 @@ DEV_SUFFIX?=-git
LOCAL_PACKAGES?=app app/controllers app/options app/watchers LOCAL_PACKAGES?=app app/controllers app/options app/watchers
IMG_NAMESPACE?=cloudnativelabs IMG_NAMESPACE?=cloudnativelabs
GIT_COMMIT=$(shell git describe --tags --dirty) GIT_COMMIT=$(shell git describe --tags --dirty)
IMG_TAG?=$(if $(IMG_TAG_PREFIX),$(IMG_TAG_PREFIX)-) GIT_BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
# GIT_BRANCH?=$(shell git rev-parse --abbrev-ref HEAD) IMG_TAG?=$(if $(IMG_TAG_PREFIX),$(IMG_TAG_PREFIX)-)$(GIT_BRANCH)-latest
RELEASE_TAG?=$(shell build/get-git-tag.sh) RELEASE_TAG?=$(shell build/get-git-tag.sh)
REGISTRY?=$(if $(IMG_FQDN),$(IMG_FQDN)/$(IMG_NAMESPACE)/$(NAME),$(IMG_NAMESPACE)/$(NAME)) REGISTRY?=$(if $(IMG_FQDN),$(IMG_FQDN)/$(IMG_NAMESPACE)/$(NAME),$(IMG_NAMESPACE)/$(NAME))
REGISTRY_DEV?=$(REGISTRY)$(DEV_SUFFIX) REGISTRY_DEV?=$(REGISTRY)$(DEV_SUFFIX)
@ -29,6 +29,9 @@ run: kube-router ## Runs "kube-router --help".
container: kube-router ## Builds a Docker container image. container: kube-router ## Builds a Docker container image.
@echo Starting kube-router container image build. @echo Starting kube-router container image build.
$(DOCKER) build -t "$(REGISTRY_DEV):$(IMG_TAG)" . $(DOCKER) build -t "$(REGISTRY_DEV):$(IMG_TAG)" .
@if [ "$(GIT_BRANCH)" = "master" ]; then \
$(DOCKER) tag "$(REGISTRY_DEV):$(IMG_TAG)" "$(REGISTRY_DEV):latest"; \
fi
@echo Finished kube-router container image build. @echo Finished kube-router container image build.
docker-login: ## Logs into a docker registry using {DOCKER,QUAY}_{USERNAME,PASSWORD} variables. docker-login: ## Logs into a docker registry using {DOCKER,QUAY}_{USERNAME,PASSWORD} variables.