@@ -222,15 +222,18 @@ for DOCKER_TARGET in "${DOCKER_TARGETS[@]}"; do
222
222
# composing the additional DOCKER_SHORT_TAG,
223
223
# i.e. "v2.6.1" becomes "v2.6",
224
224
# which is only relevant for version tags
225
+ # Also let "latest" follow the highest version
225
226
# ##
226
227
if [[ " ${TAG} " =~ ^v([0-9]+)\. ([0-9]+)\. [0-9]+$ ]]; then
227
228
MAJOR=${BASH_REMATCH[1]}
228
229
MINOR=${BASH_REMATCH[2]}
229
230
230
231
TARGET_DOCKER_SHORT_TAG=" ${DOCKER_SHORT_TAG-${DOCKER_REGISTRY} / ${DOCKER_ORG} / ${DOCKER_REPO} : v${MAJOR} .${MINOR} } "
232
+ TARGET_DOCKER_LATEST_TAG=" latest"
231
233
232
234
if [ " ${DOCKER_TARGET} " != " main" ]; then
233
235
TARGET_DOCKER_SHORT_TAG=" ${TARGET_DOCKER_SHORT_TAG} -${DOCKER_TARGET} "
236
+ TARGET_DOCKER_LATEST_TAG=" ${TARGET_DOCKER_LATEST_TAG} -${DOCKER_TARGET} "
234
237
fi
235
238
fi
236
239
@@ -292,6 +295,7 @@ for DOCKER_TARGET in "${DOCKER_TARGETS[@]}"; do
292
295
)
293
296
if [ -n " ${TARGET_DOCKER_SHORT_TAG} " ]; then
294
297
DOCKER_BUILD_ARGS+=( -t " ${TARGET_DOCKER_SHORT_TAG} " )
298
+ DOCKER_BUILD_ARGS+=( -t " ${TARGET_DOCKER_LATEST_TAG} " )
295
299
fi
296
300
297
301
# --label
@@ -344,6 +348,8 @@ for DOCKER_TARGET in "${DOCKER_TARGETS[@]}"; do
344
348
echo " Build reason set to: ${BUILD_REASON} "
345
349
$DRY docker build " ${DOCKER_BUILD_ARGS[@]} " .
346
350
echo " ✅ Finished building the Docker images '${TARGET_DOCKER_TAG} '"
351
+ echo " 🔎 Inspecting labels on '${TARGET_DOCKER_TAG} '"
352
+ $DRY docker inspect " ${TARGET_DOCKER_TAG} " --format " {{json .Config.Labels}}"
347
353
else
348
354
echo " Build skipped because sources didn't change"
349
355
echo " ::set-output name=skipped::true"
@@ -354,16 +360,12 @@ for DOCKER_TARGET in "${DOCKER_TARGETS[@]}"; do
354
360
# Pushing the docker images if either `--push` or `--push-only` are passed
355
361
# ##
356
362
if [ " ${2} " == " --push" ] || [ " ${2} " == " --push-only" ] ; then
357
- echo " ⏫ Inspecting labels on '${TARGET_DOCKER_TAG} '"
358
- $DRY docker inspect " ${TARGET_DOCKER_TAG} " --format " {{json .Config.Labels}}"
359
- echo " ⏫ Pushing '${TARGET_DOCKER_TAG} '"
360
- $DRY docker push " ${TARGET_DOCKER_TAG} "
361
- echo " ✅ Finished pushing the Docker image '${TARGET_DOCKER_TAG} '."
363
+ source ./build-functions/docker-functions.sh
364
+ push_image_to_registry " ${TARGET_DOCKER_TAG} "
362
365
363
366
if [ -n " ${TARGET_DOCKER_SHORT_TAG} " ]; then
364
- echo " ⏫ Pushing '${TARGET_DOCKER_SHORT_TAG} '"
365
- $DRY docker push " ${TARGET_DOCKER_SHORT_TAG} "
366
- echo " ✅ Finished pushing the Docker image '${TARGET_DOCKER_SHORT_TAG} '."
367
+ push_image_to_registry " ${TARGET_DOCKER_SHORT_TAG} "
368
+ push_image_to_registry " ${TARGET_DOCKER_LATEST_TAG} "
367
369
fi
368
370
fi
369
371
done
0 commit comments