Merge ~toabctl/ubuntu-docker-images/+git/utils:tag-filter into ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:main

[Thomas Bechtold]

tag-images.sh: add --tag-filter to tag only a specific _edge tag
Currently the tag-images.sh script interates over all the given _edge
tags from the given images in the given namespace and adds the needed
tags (eg. _beta, _candidate or _stable). That's not always
wanted. Eg. when using the script in a CI pipeline where a job does
only update a specific image (eg. the "impish-21.10_edge" tagged
image), the script should only add the additional tags to that tagged
image.
With the new parameter, that's possible.
Assuming there are multiple _edge tags (eg. "impish-21.10_edge" and
"hirsute-21.04_edge") for a given image and --tag-filter is set to
"impish", the script will now only add the extra tags to the image
that is tagged with "impish-21.10_edge" .

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Thomas.

I like the idea of filtering tags; this is something I've been meaning to implement for a while TBH. I understand that this only works for Ubuntu base images for now, but hey, baby steps.

I'm leaving a comment about a discrepancy between how you declare the TAG_FILTER variable and how you use it (array vs. normal variable). With that fixed, I can merge the MP.

Thanks again.

review: Needs Fixing

[Sergio Durigan Junior (sergiodj)]

Merged, thanks.

diff --git a/tag-images.sh b/tag-images.sh
index 5e04f49..f4e212b 100755
--- a/tag-images.sh
+++ b/tag-images.sh
@@ -88,6 +88,15 @@ Arguments:
 
   --dry-run				Do a dry run
 
+  --tag-filter TAG_FILTER		Do not tag all found "M.N-XX.YY_edge" tags for the given
+					Namespace and images, but only the ones where "M.N"
+					matches the given TAG_FILTER. Eg. if an image has the
+					tags "impish-21.10_edge" and "hirsute-21.04_edge" and
+					the TAG_FILTER is set to "impish", tagging will only be
+					done for the "impish-21.10_edge" tag.
+					Note: this currently only works for base images
+					where the IMAGE name must be "ubuntu"
+
   -- IMAGE_1 IMAGE_2 ... IMAGE_N	Images to tag.  If not specified,
   	 	    			the script will obtain the list of
 					all images from REGISTRY/NAMESPACE
@@ -132,6 +141,11 @@ do_tag_base_ubuntu_image ()
 	IMG_DISTRONAME=$(cut -d'-' -f1 <<< "$EDGE_TAG_PREFIX")
 	IMG_RELEASEVER=$(cut -d'-' -f2 <<< "$EDGE_TAG_PREFIX")
 
+	if [ -n "$TAG_FILTER" ] && [ "$TAG_FILTER" != "$IMG_DISTRONAME" ]; then
+	    info "Skipping $edgetag due to --tag-filter=$TAG_FILTER"
+	    continue
+	fi
+
 	# Tag the DISTRONAME.
 	if [ -n "$FORCE" ] || ! grep -Fwq "${IMG_DISTRONAME}" <<< "${IMAGE_TAGS[@]}"; then
 	    info "Invoking multi-arch tagger for ${NAMESPACE}/${image}:${IMG_DISTRONAME} (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
@@ -332,6 +346,11 @@ while [ -n "$1" ]; do
 	    shift 2
 	    ;;
 
+	"--tag-filter")
+	    TAG_FILTER="$2"
+	    shift 2
+	    ;;
+
 	"-h"|"--help")
 	    usage
 	    exit 0