airship/drydock
Code Issues Proposed changes

Add labels to Docker image

Browse Source 
This ps allows labels to be added to the docker image at build
time

Change-Id: Iff40db4b34a549c976b0ac27f4ed0cba3bcb235c
This commit is contained in:
Stacey Fletcher 2018-02-17 15:19:25 -06:00
parent 3779077a35
commit 455c3215db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -19,7 +19,7 @@ HELM ?= helm
PROXY ?= http://one.proxy.att.com:8080
USE_PROXY ?= false
PUSH_IMAGE ?= false
LABEL ?= commit-id
export
# Build all docker images for this project
@ -65,9 +65,9 @@ dry-run: clean
.PHONY: build_drydock
build_drydock:
ifeq ($(USE_PROXY), true)
docker build -t $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) -f images/drydock/Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
docker build -t $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) -f images/drydock/Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
else
docker build -t $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) -f images/drydock/Dockerfile .
docker build -t $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) -f images/drydock/Dockerfile .
endif
ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG)