refactor recentstack -> recent

.circleci/config.yml

@@ -112,12 +112,12 @@ workflows:
                 "15-3.4-bullseye",
                 "15-3.4-bundle-bookworm",
                 "15-master-bookworm",
-                "15-recentstack-bookworm",
+                "15-recent-bookworm",
                 "16-3.4-alpine3.18",
 #   --skip--    "16-3.4-bookworm",  -->  generated with the related bundle job!
                 "16-3.4-bullseye",
                 "16-3.4-bundle-bookworm",
                 "16-master-bookworm",
-                "16-recentstack-bookworm",
+                "16-recent-bookworm",
 #circleci-targets-end
               ]

Dockerfile.alpine.template

@@ -11,11 +11,11 @@ ARG PGIS_V1_POSTGIS_CHECKOUT
 ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS {{ .[env.variant].POSTGIS_VERSION }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \
+      org.opencontainers.image.description="PostGIS ${PGIS_V1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }}
-ENV POSTGIS_SHA256 {{ .[env.variant].POSTGIS_SHA256 }}
+# ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }}
+# ENV POSTGIS_SHA256 {{ .[env.variant].POSTGIS_SHA256 }}
 
 RUN set -eux \
 #    && apk add --no-cache --virtual .fetch-deps \

apply-readme.sh

@@ -10,7 +10,7 @@ versions=$(jq 'keys[]' "$input_file")
 distinct_variants=$(jq -r 'to_entries[] | .value | keys[]' "$input_file" | sort -u)
 
 rm -f _dockerlists_*.md
-for readme_group in $distinct_variants recentstack bundle test; do
+for readme_group in $distinct_variants recent bundle test; do
     echo "init _dockerlists_${readme_group}.md"
     echo "| \`$dockername:\` tags | Dockerfile | Arch | OS | Postgres | PostGIS |" >>_dockerlists_"${readme_group}".md
     echo "| ---- | :-: | :-: | :-: | :-: | :-: |" >>_dockerlists_"${readme_group}".md
@@ -31,8 +31,8 @@ for version in $versions; do
 
         if [[ "$postgis" == "master" ]]; then
             POSTGIS_DOC_VERSION="development: postgis, geos, proj, gdal"
-        elif [[ "$postgis" == "recentstack" ]]; then
-            POSTGIS_DOC_VERSION="..recentstack: latest tagged postgis, geos, proj, gdal"
+        elif [[ "$postgis" == "recent" ]]; then
+            POSTGIS_DOC_VERSION="..recent: latest tagged postgis, geos, proj, gdal"
         else
             POSTGIS_DOC_VERSION=$(echo "$POSTGIS_VERSION" | awk -F'[+-]' '{print $1}')
         fi
@@ -54,7 +54,7 @@ echo "|-------------------------|"
 echo "|-   Generated images    -|"
 echo "|-------------------------|"
 
-for readme_group in $distinct_variants recentstack bundle test; do
+for readme_group in $distinct_variants recent bundle test; do
     echo " "
     echo "---- ${readme_group} ----"
     cat _dockerlists_"${readme_group}".md
@@ -65,7 +65,7 @@ done
 TODAY=$(date +%Y-%m-%d)
 sed -i -r "s/(## Versions) \([0-9]{4}-[0-9]{2}-[0-9]{2}\)/\1 ($TODAY)/g" README.md
 # Replace content between the special comments in README.md for each readme_group
-for readme_group in $distinct_variants recentstack bundle test; do
+for readme_group in $distinct_variants recent bundle test; do
     echo "## ${readme_group} ##"
     awk -v readme_group="$readme_group" -v content="$(<_dockerlists_"${readme_group}".md)" '
     $0 ~ "<!-- "readme_group"_begin  -->" {print; print content; f=1; next}

manifest.sh

@@ -374,19 +374,19 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:15-master \
     --target ${dockername}:15-master || true
 
-# ----- 15-recentstack-bookworm -----
+# ----- 15-recent-bookworm -----
 
-echo "manifest: ${dockername}:15-recentstack-bookworm"
+echo "manifest: ${dockername}:15-recent-bookworm"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:15-recentstack-bookworm \
-    --target ${dockername}:15-recentstack-bookworm || true
+    --template ${dockername}-ARCHVARIANT:15-recent-bookworm \
+    --target ${dockername}:15-recent-bookworm || true
 
-echo "manifest: ${dockername}:15-recentstack"
+echo "manifest: ${dockername}:15-recent"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:15-recentstack \
-    --target ${dockername}:15-recentstack || true
+    --template ${dockername}-ARCHVARIANT:15-recent \
+    --target ${dockername}:15-recent || true
 
 # ----- 16-3.4-alpine3.18 -----
 
@@ -476,16 +476,16 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:16-master \
     --target ${dockername}:16-master || true
 
-# ----- 16-recentstack-bookworm -----
+# ----- 16-recent-bookworm -----
 
-echo "manifest: ${dockername}:16-recentstack-bookworm"
+echo "manifest: ${dockername}:16-recent-bookworm"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:16-recentstack-bookworm \
-    --target ${dockername}:16-recentstack-bookworm || true
+    --template ${dockername}-ARCHVARIANT:16-recent-bookworm \
+    --target ${dockername}:16-recent-bookworm || true
 
-echo "manifest: ${dockername}:16-recentstack"
+echo "manifest: ${dockername}:16-recent"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:16-recentstack \
-    --target ${dockername}:16-recentstack || true
+    --template ${dockername}-ARCHVARIANT:16-recent \
+    --target ${dockername}:16-recent || true