admin/docker-emulator-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove travis build number support & fix registry login

Browse Source
This commit is contained in:
Anton Malinskiy
2018-02-17 02:18:35 +07:00
parent 239116b0a8
commit a020c01e32
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -30,7 +30,7 @@ tag: generate
done
login:
@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)"
@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)" "$(PROXY)"
push: login
for version in $(VERSIONS); do \

2
templates/Makefile
View File

@@ -1,7 +1,7 @@
OWNER=agoda
IMAGE_NAME=docker-emulator-{{ platform }}
VCS_REF=`git rev-parse --short HEAD`
IMAGE_VERSION=1.0.$(TRAVIS_BUILD_NUMBER)
IMAGE_VERSION ?= 1.0.0
PROXY ?=
QNAME=$(PROXY)$(OWNER)/$(IMAGE_NAME)