Remove travis build number support & fix registry login
This commit is contained in:
2
Makefile
2
Makefile
@@ -30,7 +30,7 @@ tag: generate
|
|||||||
done
|
done
|
||||||
|
|
||||||
login:
|
login:
|
||||||
@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)"
|
@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)" "$(PROXY)"
|
||||||
|
|
||||||
push: login
|
push: login
|
||||||
for version in $(VERSIONS); do \
|
for version in $(VERSIONS); do \
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
OWNER=agoda
|
OWNER=agoda
|
||||||
IMAGE_NAME=docker-emulator-{{ platform }}
|
IMAGE_NAME=docker-emulator-{{ platform }}
|
||||||
VCS_REF=`git rev-parse --short HEAD`
|
VCS_REF=`git rev-parse --short HEAD`
|
||||||
IMAGE_VERSION=1.0.$(TRAVIS_BUILD_NUMBER)
|
IMAGE_VERSION ?= 1.0.0
|
||||||
PROXY ?=
|
PROXY ?=
|
||||||
QNAME=$(PROXY)$(OWNER)/$(IMAGE_NAME)
|
QNAME=$(PROXY)$(OWNER)/$(IMAGE_NAME)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user