Merge ~virtustom/ubuntu-docker-images/+git/utils:main into ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:main

[Tomáš Virtus]

tag-image.sh: Small fixes

Tested on personal Docker Hub (https://hub.docker.com/r/ubuvirtus/ubuntu) with existing tags:

21.10
impish
impish-21.10_edge
20.04_edge
20.04_candidate
20.04_beta
20.04_stable
20.04
focal-20.04_edge
18.04_stable
bionic
bionic-18.04_edge

and command line (code changed to accept ubuvirtus):

  ./tag-images.sh -r docker -n ubuvirtus -- ubuntu

it creates:

I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04 (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_edge (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_beta (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_candidate (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:focal (source tag: focal-20.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.10_edge (source tag: impish-21.10_edge) (on docker)
I: Not adding stable/beta/candidate tags to current devel release impish

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Tomasz.

I haven't tested it "in production" but I think I found a problem with the suggested approach. Please take a look at my inline comment below :-).

Cheers.

review: Needs Fixing

[Sergio Durigan Junior (sergiodj)]

Of course, another way to solve this is to move the definition of TAG_SUFFIXES inside the loop. I still prefer the first approach I outlined, though, because I see TAG_SUFFIXES as a const variable that shouldn't really be changed during the function.

[Tomáš Virtus (virtustom)]

OMG. That's... humiliating mistake. T_T Thanks for the find and the tip. Your 1st suggestion is what I'll do in a moment.

[Tomáš Virtus (virtustom)]

This time tested. See updated MP description for details.

[Thomas Bechtold (toabctl)]

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thanks, this LGTM now.

I will merge your branch tomorrow (it's too late for me right now). I just have a very small comment regarding the commit message: I think the "Fixes: e5f6309" is confusing, so IMO you can just get rid of it.

Thanks again.

review: Approve

[Tomáš Virtus (virtustom)]

Had the same doubt. Removed.

[Sergio Durigan Junior (sergiodj)]

Thanks, this has been merged.

diff --git a/tag-images.sh b/tag-images.sh
index b6dd208..0f90f5d 100755
--- a/tag-images.sh
+++ b/tag-images.sh
@@ -118,7 +118,10 @@ EOF
 do_tag_base_ubuntu_image ()
 {
     local image="ubuntu"
-    local -a TAG_SUFFIXES=( "stable" "beta" "candidate" "edge" )
+    # These suffixes are for 'XX.YY_${suffix}' tags applied to
+    # non-devel releases only. 'XX.YY_edge' tag is applied separately
+    # to every release.
+    local -a TAG_SUFFIXES=( "stable" "beta" "candidate" )
 
     local -a IMAGE_TAGS EDGE_TAGS
 
@@ -151,7 +154,7 @@ do_tag_base_ubuntu_image ()
 	fi
 
 	# Tag the DISTRONAME.
-	if [ -n "$FORCE" ] || ! grep -Fwq "${IMG_DISTRONAME}" <<< "${IMAGE_TAGS[@]}"; then
+	if [ -n "$FORCE" ] || ! printf '%s\n' "${IMAGE_TAGS[@]}" | grep -Fxq "${IMG_DISTRONAME}"; then
 	    info "Invoking multi-arch tagger for ${NAMESPACE}/${image}:${IMG_DISTRONAME} (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
 	    tag_image \
 		"${image}" \
@@ -160,7 +163,7 @@ do_tag_base_ubuntu_image ()
 	fi
 
 	# Tag the RELEASEVER
-	if [ -n "$FORCE" ] || ! grep -Fwq "${IMG_RELEASEVER}" <<< "${IMAGE_TAGS[@]}"; then
+	if [ -n "$FORCE" ] || ! printf '%s\n' "${IMAGE_TAGS[@]}" | grep -Fxq "${IMG_RELEASEVER}"; then
 	    info "Invoking multi-arch tagger for ${NAMESPACE}/${image}:${IMG_RELEASEVER} (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
 	    tag_image \
 		"${image}" \
@@ -168,6 +171,15 @@ do_tag_base_ubuntu_image ()
 		"${IMG_RELEASEVER}"
 	fi
 
+	# Tag the RELEASEVER_edge
+	if [ -n "$FORCE" ] || ! printf '%s\n' "${IMAGE_TAGS[@]}" | grep -Fxq "${IMG_RELEASEVER}_edge"; then
+	    info "Invoking multi-arch tagger for ${NAMESPACE}/${image}:${IMG_RELEASEVER}_edge (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
+	    tag_image \
+		"${image}" \
+		"${EDGE_TAG_PREFIX}_edge" \
+		"${IMG_RELEASEVER}_edge"
+	fi
+
 	if [ "$IMG_DISTRONAME" = "$DISTRONAME_DEVEL" ]; then
 	    info "Not adding stable/beta/candidate tags to current devel release $IMG_DISTRONAME"
 	    continue
@@ -175,7 +187,7 @@ do_tag_base_ubuntu_image ()
 
 	for tagsuffix in "${TAG_SUFFIXES[@]}"; do
 	    # Tag each suffix.
-	    if [ -n "$FORCE" ] || ! grep -Fwq "${IMG_RELEASEVER}_${tagsuffix}" <<< "${IMAGE_TAGS[@]}"; then
+	    if [ -n "$FORCE" ] || ! printf '%s\n' "${IMAGE_TAGS[@]}" | grep -Fxq "${IMG_RELEASEVER}_${tagsuffix}"; then
 		info "Invoking multi-arch tagger for ${NAMESPACE}/${image}:${IMG_RELEASEVER}_${tagsuffix} (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
 		tag_image \
 		    "${image}" \