chore: simplify common structure

Signed-off-by: Niccolò Fei <[email protected]>

Author: NiccoloFei

docker-bake.hcl

@@ -56,7 +56,6 @@ target "default" {
   args = {
     PG_MAJOR = "${pgVersion}"
     EXT_VERSION = "${getExtensionPackage(distro, pgVersion)}"
-    EXT_MAJOR = "${metadata.major_version}"
     BASE = "${getBaseImage(distro, pgVersion)}"
   }
 

pgvector/metadata.hcl

@@ -6,7 +6,6 @@ metadata = {
   extension_control_path   = []
   dynamic_library_path     = []
   ld_library_path          = []
-  major_version            = null
 
   versions = {
     bookworm = {

postgis/Dockerfile

@@ -3,7 +3,7 @@ FROM $BASE AS builder
 
 ARG PG_MAJOR
 ARG EXT_VERSION
-ARG EXT_MAJOR
+ARG POSTGIS_MAJOR
 ARG PG_ROUTING_VERSION
 
 USER 0
@@ -14,7 +14,7 @@ RUN set -eux && \
 	# Install PostGIS
 	apt-get update && \
 	apt-get install -y --no-install-recommends \
-		"postgresql-${PG_MAJOR}-postgis-${EXT_MAJOR}=${EXT_VERSION}" \
+		"postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR}=${EXT_VERSION}" \
 		"postgresql-${PG_MAJOR}-pgrouting=${PG_ROUTING_VERSION}"
 
 # Gather PostGIS system libraries and their licenses
@@ -44,27 +44,38 @@ RUN mkdir -p /system /licenses && \
 	# Get licenses
 	for lib in $(find /system -maxdepth 1 -type f -name '*.so*'); do \
 		# Get the name of the pkg that installed the library
-		pkg=$(dpkg -S "$(basename "$lib")" | awk -F: '/:/{print $1; exit}'); \
+		pkg=$(dpkg -S "$(basename "$lib")" | grep -v "diversion by" | awk -F: '/:/{print $1; exit}'); \
+		echo "$lib: $pkg"; \
 		[ -z "$pkg" ] && continue; \
 		mkdir -p "/licenses/$pkg" && cp -a "/usr/share/doc/$pkg/copyright" "/licenses/$pkg/copyright"; \
 	done
 
 
 FROM scratch
 ARG PG_MAJOR
-ARG EXT_MAJOR
+ARG POSTGIS_MAJOR
 
 # Licenses
 COPY --from=builder /licenses /licenses/
-COPY --from=builder /usr/share/doc/postgresql-${PG_MAJOR}-postgis-${EXT_MAJOR}/copyright /licenses/postgresql-${PG_MAJOR}-postgis-${EXT_MAJOR}/
+COPY --from=builder /usr/share/doc/postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR}/copyright /licenses/postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR}/
 COPY --from=builder /usr/share/doc/postgresql-${PG_MAJOR}-pgrouting/copyright /licenses/postgresql-${PG_MAJOR}-pgrouting/
 
 # Libraries
-COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/address_standardizer* /usr/lib/postgresql/${PG_MAJOR}/lib/postgis* /usr/lib/postgresql/${PG_MAJOR}/lib/libpgrouting* /lib/
+COPY --from=builder \
+	/usr/lib/postgresql/${PG_MAJOR}/lib/address_standardizer* \
+	/usr/lib/postgresql/${PG_MAJOR}/lib/postgis* \
+	/usr/lib/postgresql/${PG_MAJOR}/lib/libpgrouting* \
+	/lib/
+
 COPY --from=builder /usr/lib/postgresql/18/lib/bitcode/ /lib/bitcode/
 
 # Share
-COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/address_standardizer* /usr/share/postgresql/${PG_MAJOR}/extension/postgis* /share/extension/
+COPY --from=builder \
+	/usr/share/postgresql/${PG_MAJOR}/extension/address_standardizer* \
+	/usr/share/postgresql/${PG_MAJOR}/extension/postgis* \
+	/usr/share/postgresql/${PG_MAJOR}/extension/pgrouting* \
+	/share/extension/
+
 COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/contrib/postgis* /share/contrib/
 
 # System libs

postgis/metadata.hcl

@@ -6,7 +6,6 @@ metadata = {
   extension_control_path   = []
   dynamic_library_path     = []
   ld_library_path          = ["/system"]
-  major_version            = "3"
 
   versions = {
     bookworm = {
@@ -18,16 +17,16 @@ metadata = {
       "18" = "3.6.1+dfsg-1.pgdg13+1"
     }
   }
+}
 
-  pgRouting = {
-    bookworm = {
-      // renovate: suite=bookworm-pgdg depName=postgresql-18-pgrouting
-      "18" = "4.0.0-1.pgdg12+1"
-    }
-    trixie = {
-      // renovate: suite=trixie-pgdg depName=postgresql-18-pgrouting
-      "18" = "4.0.0-1.pgdg13+1"
-    }
+pgRouting = {
+  bookworm = {
+    // renovate: suite=bookworm-pgdg depName=postgresql-18-pgrouting
+    "18" = "4.0.0-1.pgdg12+1"
+  }
+  trixie = {
+    // renovate: suite=trixie-pgdg depName=postgresql-18-pgrouting
+    "18" = "4.0.0-1.pgdg13+1"
   }
 }
 
@@ -39,6 +38,7 @@ target "default" {
   }
 
   args = {
-    PG_ROUTING_VERSION = metadata.pgRouting[distro][pgVersion]
+    PG_ROUTING_VERSION = pgRouting[distro][pgVersion]
+    POSTGIS_MAJOR = "3"
   }
 }