Self-review

Author: webbnh

agent/containers/images/Makefile

@@ -1,5 +1,33 @@
 # Base Makefile for building all images and tagging them
 
+# List of external Make targets:
+#
+#   FIXME:  Are there any missing from this list?  Are there any here which can/should be removed (e.g., the last two)??
+#
+#   These act on all default platforms' containers:
+#
+#     all (default):  make all images for all default platforms
+#     tds:  make Tool Data Sink images for all default platforms
+#     tm:  make Tool Meister images for all default platforms
+#     tag-<TYPE> (e.g., "tag-latest"):  apply specified tag to all images for all default platforms
+#     push:  push images for all default platforms with "<git commit hash>" and "v<full RPM version>" tags
+#     push-<TYPE> (e.g., "push-latest"):  push images for all default platforms with specified tag
+#
+#   These act on the indicated distribution's containers:
+#
+#     <DISTRO> (e.g., "fedora-34"):  make all images for the requested platform
+#     <DISTRO>-tds (e.g., "fedora-34-tds"):  make the TDS image for the requested platform
+#     <DISTRO>-tm (e.g., "fedora-34-tds"):  make the TDS image for the requested platform
+#     <DISTRO>-tag-<TYPE> (e.g., "fedora-34-tag-alpha"):  apply the specified tag to the distro containers
+#
+#   Utility targets:
+#
+#     clean:  remove build artifacts
+#     pkgmgr-clean:  clear the local package manager cache
+#     all-tags:  build all default distro "-tags.lis" files and verify that they are consistent.
+#     all-dockerfiles:  build all default distro ".repo" and ".Dockerfile" files
+#
+
 # By default we only build images for x86_64 architectures.
 _ARCH = x86_64
 
@@ -80,7 +108,7 @@ _WORKLOAD_RPMS = fio uperf
 # Not intended to be overridden with an environment variable.
 _ALL_RPMS = ${_TOOL_RPMS} ${_WORKLOAD_RPMS}
 
-# Compose a lists of all conceivable distro-version strings (e.g.,
+# Compose lists of all conceivable distro-version strings (e.g.,
 # `_ALL_centos_VERSIONS` including "centos-7", "centos-8", "centos-9",
 # `_ALL_fedora_VERSIONS` including "fedora-32", "fedora-33", and "fedora-34",
 # and `_DISTROS` containing the contents of all the lists) which will be used
@@ -89,18 +117,18 @@ _DIGITS := 0 1 2 3 4 5 6 7 8 9
 _NUMBERS := $(patsubst 0%,%,$(foreach t,${_DIGITS},$(foreach o,${_DIGITS},${t}${o})))
 _ALL_DISTRO_NAMES := centos fedora
 _ADV_TMPL = _ALL_${d}_VERSIONS := $(foreach v,${_NUMBERS},${d}-${v}) # template for setting version lists
-$(foreach d,${_ALL_DISTRO_NAMES},$(eval $(call _ADV_TMPL, $d)))  # set _ALL_centos_VERSIONS, etc.
+$(foreach d,${_ALL_DISTRO_NAMES},$(eval $(call _ADV_TMPL, ${d})))  # set _ALL_centos_VERSIONS, etc.
 _DISTROS := $(foreach d,${_ALL_DISTRO_NAMES},${_ALL_${d}_VERSIONS})
 
 # By default we only build images for the following distributions:
 _DEFAULT_DISTROS = centos-8 fedora-33 fedora-34
 
 # By default we won't build the Tool Data Sink and Tool Meister images
-all: pkgmgr-clean all-tags $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-all-tagged)
+all: pkgmgr-clean all-tags $(_DEFAULT_DISTROS:%=%-all-tagged)
 
-tds: pkgmgr-clean all-tags $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-tool-data-sink-tagged)
+tds: pkgmgr-clean all-tags $(_DEFAULT_DISTROS:%=%-tool-data-sink-tagged)
 
-tm: pkgmgr-clean all-tags $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-tool-meister-tagged)
+tm: pkgmgr-clean all-tags $(_DEFAULT_DISTROS:%=%-tool-meister-tagged)
 
 #+
 # For the following rule patterns, the "%" represents the "distribution" name,
@@ -112,15 +140,18 @@ tm: pkgmgr-clean all-tags $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-tool-
 # See https://www.gnu.org/software/make/manual/make.html#Automatic-Variables
 #-
 
-%: DIST_NAME = $(wordlist 1, 1, $(subst -, ,$*))
-%: DIST_VERSION = $(wordlist 2, 2, $(subst -, ,$*))
-
 # We also offer targets per distribution target
 ${_DISTROS}: %: pkgmgr-clean %-all-tagged
 
-%-tds: pkgmgr-clean %-tool-data-sink-tagged
+$(_DISTROS:%=%-tds): %-tds: pkgmgr-clean %-tool-data-sink-tagged
 
-%-tm: pkgmgr-clean %-tool-meister-tagged
+$(_DISTROS:%=%-tm): %-tm: pkgmgr-clean %-tool-meister-tagged
+
+# For any given target, extract the distribution name and version from the
+# first two fields, e.g., fedora-35-tds would yield values "fedora" and "35"
+# for DIST_NAME and DIST_VERSION, respectively.
+%: DIST_NAME = $(wordlist 1, 1, $(subst -, ,$*))
+%: DIST_VERSION = $(wordlist 2, 2, $(subst -, ,$*))
 
 
 # Tagging targets
@@ -131,18 +162,18 @@ ${_DISTROS}: %: pkgmgr-clean %-all-tagged
 #
 # See the `tagit` script for details.
 _TAG_TYPES = latest alpha beta major major-minor
-tag-%: $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-tag-%)
+$(_TAG_TYPES:%=tag-%): tag-%: $(_DEFAULT_DISTROS:%=%-tag-%)
 
 
 #+
 # Push targets
 #-
 
 # Push images with "<git commit hash>" and "v<full RPM version>" tags.
-push: $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-push)
+push: $(_DEFAULT_DISTROS:%=%-push)
 
 # Push images with a specific tag (see the `tag-%` target).
-push-%: $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-push-%)
+$(_TAG_TYPES:%=push-%): push-%: $(_DEFAULT_DISTROS:%=%-push-%)
 
 
 #+
@@ -182,7 +213,7 @@ push-%: $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-push-%)
 
 # Add an additional dependency for centos-%-tools targets (this .repo file is
 # not required on Fedora).
-$(foreach d,${_ALL_centos_VERSIONS},${d}-tools): centos-%-tools: centos-%-prometheus.repo
+$(_ALL_centos_VERSIONS:%=%-tools): centos-%-tools: centos-%-prometheus.repo
 
 %-tools: %-base-tagged %-tools.Dockerfile %-pcp.repo %-tags.lis
 	./build-image tools $* $*-tags.lis
@@ -216,7 +247,7 @@ define _PUSH_RULE
 	./push ${IMAGE_REPO} $$* $(1)
 endef
 
-$(foreach tagtype,${_TAG_TYPES},$(eval $(call _PUSH_RULE,$tagtype)))  # Define rules
+$(foreach tagtype,${_TAG_TYPES},$(eval $(call _PUSH_RULE,${tagtype})))  # Define rules
 
 %-push: %-tags.lis
 	./push ${IMAGE_REPO} $*
@@ -228,12 +259,14 @@ $(foreach tagtype,${_TAG_TYPES},$(eval $(call _PUSH_RULE,$tagtype)))  # Define r
 # of "v<Major>.<Minor>-latest".
 #-
 
+#$(_DISTROS:%=%-tag-$(1)):
+
 define _TAG_RULE
 %-tag-$(1): %-tags.lis
 	./tagit $$* $(1)$(if $(findstring major,$(1)),-latest)
 endef
 
-$(foreach tagtype,${_TAG_TYPES},$(eval $(call _TAG_RULE,$tagtype)))  # Define rules
+$(foreach tagtype,${_TAG_TYPES},$(eval $(call _TAG_RULE,${tagtype})))  # Define rules
 
 # Build the tags file for the given distribution.
 %-tags.lis:
@@ -272,14 +305,12 @@ fedora-%-base.Dockerfile: Dockerfile.base.j2
 
 # Helper target to build each distro's ".repo" and ".Dockerfile"
 all-dockerfiles: \
-    $(foreach distro, \
-        ${_DEFAULT_DISTROS}, \
-        ${distro}-base.Dockerfile ${distro}-tools.Dockerfile \
-            ${distro}-workloads.Dockerfile ${distro}-all.Dockerfile)
+    $(_DEFAULT_DISTROS:%=%-base.Dockerfile) $(_DEFAULT_DISTROS:%=%-tools.Dockerfile) \
+    $(_DEFAULT_DISTROS:%=%-workloads.Dockerfile) $(_DEFAULT_DISTROS:%=%-all.Dockerfile)
 
 # Helper target to build each distro's "-tags.lis" file and verify they
 # are consistent.
-all-tags: pkgmgr-clean $(foreach distro, ${_DEFAULT_DISTROS}, ${distro}-tags.lis)
+all-tags: pkgmgr-clean $(_DEFAULT_DISTROS:%=%-tags.lis)
 	./verify-tags *-tags.lis
 
 %-pbench.repo: %-pbench.yml ${_PBENCH_REPO_TEMPLATE}