summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-08 20:10:03 +0000
committerGerrit Code Review <review@openstack.org>2018-11-08 20:10:03 +0000
commit44316619866bdf741851868045677c4b78ef766a (patch)
tree7698072ce0f673ff38e4b501d58adaa58e089694
parenta45d6a778048e143e144d0ab37e92c87ae620d5c (diff)
parent2c09054c4be0b41f9babb7c95d352d03b05c6bc9 (diff)
Merge "Fix: adding back the possibility to add arbitrary labels"
-rw-r--r--Makefile4
-rwxr-xr-xtools/drydock_image_build.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4d25996..cf9eaf3 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,9 @@ PROXY ?= http://proxy.foo.com:8000
22NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local 22NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
23USE_PROXY ?= false 23USE_PROXY ?= false
24PUSH_IMAGE ?= false 24PUSH_IMAGE ?= false
25COMMIT ?= commit-id 25# use this variable for image labels added in internal build process
26LABEL ?= org.airshipit.build=community
27COMMIT ?= $(shell git rev-parse HEAD)
26IMAGE ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} 28IMAGE ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
27GO_BUILDER ?= docker.io/golang:1.10-stretch 29GO_BUILDER ?= docker.io/golang:1.10-stretch
28 30
diff --git a/tools/drydock_image_build.sh b/tools/drydock_image_build.sh
index 41c2a4d..e0e585a 100755
--- a/tools/drydock_image_build.sh
+++ b/tools/drydock_image_build.sh
@@ -22,7 +22,7 @@ then
22 ADDL_BUILD_ARGS="${ADDL_BUILD_ARGS}| --build-arg PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST}" 22 ADDL_BUILD_ARGS="${ADDL_BUILD_ARGS}| --build-arg PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST}"
23fi 23fi
24 24
25docker build --network host -t ${IMAGE} \ 25docker build --network host -t ${IMAGE} --label ${LABEL} \
26 --label org.opencontainers.image.revision=${COMMIT} \ 26 --label org.opencontainers.image.revision=${COMMIT} \
27 --label org.opencontainers.image.created="$(date --rfc-3339=seconds --utc)" \ 27 --label org.opencontainers.image.created="$(date --rfc-3339=seconds --utc)" \
28 --label org.opencontainers.image.title=${IMAGE_NAME} \ 28 --label org.opencontainers.image.title=${IMAGE_NAME} \