ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-23 17:53:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #319 from resin-io/removed_docker_tag_force

Browse Source 
Makefile: removed the deprecated force flag
This commit is contained in:
Yossi
2016-10-19 12:58:46 -05:00
committed by GitHub
parent 95d060757f 345b1d87f1
commit b13ff7a491
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -26,6 +26,18 @@ DEPLOY_REGISTRY =
SUPERVISOR_VERSION = master
DOCKER_VERSION:=$(shell docker version --format '{{.Server.Version}}')
DOCKER_MAJOR_VERSION:=$(word 1, $(subst ., ,$(DOCKER_VERSION)))
DOCKER_MINOR_VERSION:=$(word 2, $(subst ., ,$(DOCKER_VERSION)))
DOCKER_GE_1_12 := $(shell [ $(DOCKER_MAJOR_VERSION) -gt 1 -o \( $(DOCKER_MAJOR_VERSION) -eq 1 -a $(DOCKER_MINOR_VERSION) -ge 12 \) ] && echo true)
# In docker 1.12 tag --force has been removed.
ifeq ($(DOCKER_GE_1_12),true)
DOCKER_TAG_FORCE=
else
DOCKER_TAG_FORCE=-f
endif
all: supervisor
PUBNUB_SUBSCRIBE_KEY = sub-c-bananas
@ -160,7 +172,7 @@ lint:
docker run --rm resin/node-supervisor-$(ARCH):$(SUPERVISOR_VERSION) bash -c 'npm install resin-lint && npm run lint'
deploy: supervisor
docker tag -f $(IMAGE) $(SUPERVISOR_IMAGE)
docker tag $(DOCKER_TAG_FORCE) $(IMAGE) $(SUPERVISOR_IMAGE)
bash retry_docker_push.sh $(SUPERVISOR_IMAGE)
nodesuper: