refactor layout

python extensions are built using strictly versioned libpq-dev

build-scripts/image-base.sh

@@ -27,7 +27,7 @@ grab_site_packages() {
 PYTHON_SITE_PACKAGES=$(grab_site_packages "docker.io/python:${PYTHONTAG}")
 [ -n "${PYTHON_SITE_PACKAGES:?}" ]
 
-img="docker.io/rockdrilla/postgresql:base-v6"
+img="docker.io/rockdrilla/postgresql:base-v7"
 
 buildah bud \
   -f ./Dockerfile.base \

build-scripts/image-deps.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-set -ef
-cd "$(dirname "$0")/.."
-
-set -a
-BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}"
-BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
-BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}"
-set +a
-
-img="docker.io/rockdrilla/postgresql:deps-v6"
-base="docker.io/rockdrilla/postgresql:base-v6"
-
-exec buildah bud \
-  -f ./Dockerfile.deps \
-  -t "${img}" \
-  --pull=missing --no-cache \
-  --build-arg "BASE_IMAGE=${base}" \

build-scripts/image.sh

@@ -8,24 +8,25 @@ BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
 BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}"
 set +a
 
-POSTGRESQL_VERSION="${1:-16.7}"
+POSTGRESQL_VERSION="${1:-17.6}"
 PG_MAJOR="${POSTGRESQL_VERSION%%.*}"
 
-img="docker.io/rockdrilla/postgresql:${POSTGRESQL_VERSION}"
-deps="docker.io/rockdrilla/postgresql:deps-v6"
+img="docker.io/rockdrilla/postgresql:${POSTGRESQL_VERSION}$2"
+orig_base="docker.io/rockdrilla/postgresql:base-v7"
+base="${orig_base}-${POSTGRESQL_VERSION}-env"
 
-c=$(buildah from --pull=missing "${deps}")
+c=$(buildah from --pull=missing "${orig_base}")
 [ -n "${c:?}" ]
 buildah config --env "POSTGRESQL_VERSION=${POSTGRESQL_VERSION}" "$c"
 buildah config --env "PG_MAJOR=${PG_MAJOR}" "$c"
-buildah commit --rm "$c" "${img}-env"
+buildah commit --rm "$c" "${base}"
 unset c
 
 buildah bud \
   -f ./Dockerfile \
   -t "${img}" \
   --pull=missing --no-cache \
-  --build-arg "DEPS_IMAGE=${img}-env" \
+  --build-arg "BASE_IMAGE=${base}" \
   --build-arg "UPSTREAM_IMAGE_VERSION=${POSTGRESQL_VERSION}" \
 
-podman image rm "${img}-env"
+podman image rm "${base}"