Skip to content

Commit 26d0830

Browse files
committed
Add labels for all variants
When we don't set the --label argument on the commandline for all build variants we lose them in the image. This also prints out the labes on image push.
1 parent 23e2da5 commit 26d0830

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

build.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -247,29 +247,27 @@ for DOCKER_TARGET in "${DOCKER_TARGETS[@]}"; do
247247
fi
248248

249249
# --label
250-
if [ "${DOCKER_TARGET}" == "main" ]; then
251-
DOCKER_BUILD_ARGS+=(
252-
--label "ORIGINAL_TAG=${TARGET_DOCKER_TAG}"
250+
DOCKER_BUILD_ARGS+=(
251+
--label "ORIGINAL_TAG=${TARGET_DOCKER_TAG}"
253252

254-
--label "org.label-schema.build-date=${BUILD_DATE}"
255-
--label "org.opencontainers.image.created=${BUILD_DATE}"
253+
--label "org.label-schema.build-date=${BUILD_DATE}"
254+
--label "org.opencontainers.image.created=${BUILD_DATE}"
256255

257-
--label "org.label-schema.version=${PROJECT_VERSION}"
258-
--label "org.opencontainers.image.version=${PROJECT_VERSION}"
256+
--label "org.label-schema.version=${PROJECT_VERSION}"
257+
--label "org.opencontainers.image.version=${PROJECT_VERSION}"
258+
)
259+
if [ -d ".git" ]; then
260+
DOCKER_BUILD_ARGS+=(
261+
--label "org.label-schema.vcs-ref=${GIT_REF}"
262+
--label "org.opencontainers.image.revision=${GIT_REF}"
263+
)
264+
fi
265+
if [ -d "${NETBOX_PATH}/.git" ]; then
266+
DOCKER_BUILD_ARGS+=(
267+
--label "NETBOX_GIT_BRANCH=${NETBOX_GIT_BRANCH}"
268+
--label "NETBOX_GIT_REF=${NETBOX_GIT_REF}"
269+
--label "NETBOX_GIT_URL=${NETBOX_GIT_URL}"
259270
)
260-
if [ -d ".git" ]; then
261-
DOCKER_BUILD_ARGS+=(
262-
--label "org.label-schema.vcs-ref=${GIT_REF}"
263-
--label "org.opencontainers.image.revision=${GIT_REF}"
264-
)
265-
fi
266-
if [ -d "${NETBOX_PATH}/.git" ]; then
267-
DOCKER_BUILD_ARGS+=(
268-
--label "NETBOX_GIT_BRANCH=${NETBOX_GIT_BRANCH}"
269-
--label "NETBOX_GIT_REF=${NETBOX_GIT_REF}"
270-
--label "NETBOX_GIT_URL=${NETBOX_GIT_URL}"
271-
)
272-
fi
273271
fi
274272

275273
# --build-arg
@@ -298,7 +296,9 @@ for DOCKER_TARGET in "${DOCKER_TARGETS[@]}"; do
298296
# Pushing the docker images if either `--push` or `--push-only` are passed
299297
###
300298
if [ "${2}" == "--push" ] || [ "${2}" == "--push-only" ] ; then
301-
echo "⏫ Pushing '${TARGET_DOCKER_TAG}"
299+
echo "⏫ Inspecting labels on '${TARGET_DOCKER_TAG}'"
300+
$DRY docker inspect "${TARGET_DOCKER_TAG}" --format "{{json .Config.Labels}}"
301+
echo "⏫ Pushing '${TARGET_DOCKER_TAG}'"
302302
$DRY docker push "${TARGET_DOCKER_TAG}"
303303
echo "✅ Finished pushing the Docker image '${TARGET_DOCKER_TAG}'."
304304

0 commit comments

Comments
 (0)