wberube
/
echoip
mirror of https://github.com/mpolden/echoip
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #89 from SuperSandro2000/docker-var 

Allow overriding docker command
This commit is contained in:
Martin Polden 2020-04-08 12:06:19 +02:00 committed by GitHub
parent 2b0842de3f 5fcd1740e7
commit 2fe2f078e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1,3 +1,4 @@
DOCKER ?= docker
DOCKER_IMAGE ?= mpolden/echoip DOCKER_IMAGE ?= mpolden/echoip
OS := $(shell uname) OS := $(shell uname)
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
@ -35,18 +36,18 @@ endif
geoip-download: $(databases) geoip-download: $(databases)
docker-build: docker-build:
docker build -t $(DOCKER_IMAGE) . $(DOCKER) build -t $(DOCKER_IMAGE) .
docker-login: docker-login:
@echo "$(DOCKER_PASSWORD)" | docker login -u "$(DOCKER_USERNAME)" --password-stdin @echo "$(DOCKER_PASSWORD)" | $(DOCKER) login -u "$(DOCKER_USERNAME)" --password-stdin
docker-test: docker-test:
$(eval CONTAINER=$(shell docker run --rm --detach --publish-all $(DOCKER_IMAGE))) $(eval CONTAINER=$(shell $(DOCKER) run --rm --detach --publish-all $(DOCKER_IMAGE)))
$(eval DOCKER_PORT=$(shell docker port $(CONTAINER) | cut -d ":" -f 2)) $(eval DOCKER_PORT=$(shell $(DOCKER) port $(CONTAINER) | cut -d ":" -f 2))
curl -fsS -m 5 localhost:$(DOCKER_PORT) > /dev/null; docker stop $(CONTAINER) curl -fsS -m 5 localhost:$(DOCKER_PORT) > /dev/null; $(DOCKER) stop $(CONTAINER)
docker-push: docker-test docker-login docker-push: docker-test docker-login
docker push $(DOCKER_IMAGE) $(DOCKER) push $(DOCKER_IMAGE)
heroku-run: geoip-download heroku-run: geoip-download
ifndef PORT ifndef PORT