refactor

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-v1"
+img="docker.io/rockdrilla/postgresql:base-v2"
 
 buildah bud \
   -f ./Dockerfile.base \

build-scripts/image-deps.sh

@@ -8,9 +8,11 @@ BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
 BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}"
 set +a
 
-img="docker.io/rockdrilla/postgresql:deps-v1"
+img="docker.io/rockdrilla/postgresql:deps-v2"
+base="docker.io/rockdrilla/postgresql:base-v2"
 
 exec buildah bud \
   -f ./Dockerfile.deps \
   -t "${img}" \
-  --pull=missing --no-cache
+  --pull=missing --no-cache \
+  --build-arg "BASE_IMAGE=${base}" \

build-scripts/image.sh

@@ -12,7 +12,7 @@ POSTGRESQL_VERSION="${1:-16.4}"
 PG_MAJOR="${POSTGRESQL_VERSION%%.*}"
 
 img="docker.io/rockdrilla/postgresql:${POSTGRESQL_VERSION}"
-deps="docker.io/rockdrilla/postgresql:deps-v1"
+deps="docker.io/rockdrilla/postgresql:deps-v2"
 
 c=$(buildah from --pull=missing "${deps}")
 [ -n "${c:?}" ]