Use base deb podman image and patch it locally with correct pg version installed inside chroot

Author: qount25

lib/pgpm/deb/Dockerfile

@@ -26,6 +26,3 @@ RUN echo 'MIRRORSITE=http://deb.debian.org/debian'  > /etc/pbuilderrc
 RUN echo 'AUTO_DEBSIGN=${AUTO_DEBSIGN:-no}'         > /root/.pbuilderrc
 RUN echo 'HOOKDIR=/var/cache/pbuilder/hooks'       >> /root/.pbuilderrc
 RUN --security=insecure pbuilder create
-
-COPY pbuilder_install_script.sh /root/pbuilder_install_script.sh
-RUN --security=insecure pbuilder execute --save-after-exec /root/pbuilder_install_script.sh

lib/pgpm/deb/builder.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "English"
-require "debug"
 
 module Pgpm
   module Deb
@@ -13,7 +12,7 @@ def initialize(spec)
       end
 
       def build
-        pull_image
+        prepare_image
         start_container
         patch_pbuilder
 
@@ -32,9 +31,16 @@ def build
 
       private
 
-      # Depends on postgres version and arch
+      # Only depends on the arch -- this is the image being pulled from
+      # a remote repo, which is then used to build a local image with correct
+      # postgres version installed inside its pbuilder's chroot.
+      def base_image_name
+        "quay.io/qount25/pgpm-debian-#{@spec.arch}"
+      end
+
+      # Locally built image with correct chroot installed.
       def image_name
-        "quay.io/qount25/pgpm-debian-pg#{@spec.package.postgres_version}-#{@spec.arch}"
+        "pgpm-debian-pg#{@spec.package.postgres_version}-#{@spec.arch}"
       end
 
       def prepare_versioned_source
@@ -102,18 +108,45 @@ def prepare_default_source
         end
       end
 
-      def pull_image
+      def prepare_image
         puts "Checking if podman image exists..."
         # Check if image exists
         system("podman image exists #{image_name}")
-        if $CHILD_STATUS.to_i.positive? # image doesn't exist -- pull image from a remote repository
-          puts "  No. Pulling image #{image_name}..."
-          system("podman pull #{image_name}")
+        if $CHILD_STATUS.to_i.positive?
+          puts "  Image for the specific pg version doesn't exist. Will build."
+          system("podman image exists #{base_image_name}")
+          if $CHILD_STATUS.to_i.positive?
+            puts "  Base image doesn't exist. Pulling it..."
+            system("podman pull #{base_image_name}")
+          end
+          build_local_image
         else
           puts "  Yes, image #{image_name} already exists! OK"
         end
       end
 
+      def build_local_image
+          puts "  Building local #{image_name}..."
+          system("podman create -it --privileged --tmpfs /tmp --name pgpm-deb-tmp #{base_image_name}")
+          system("podman start pgpm-deb-tmp")
+
+          # Generate pbuilder_install script.sh, copy it inside the image
+          pbuild_install_script_path = "#{@pgpm_dir}/pbuilder_install_script.sh"
+          puts "  Generating #{pbuild_install_script_path}..."
+          File.write "#{pbuild_install_script_path}", @spec.generate("pbuilder_install_script.sh")
+          system("podman container cp #{pbuild_install_script_path} pgpm-deb-tmp:/root/")
+
+          # This command installs relevant postgresql packages into the chroot
+          # base image inside the container (along with some other necessary
+          # packages) and saves chroot base image with these changes.
+          puts "  Updating chroot image..."
+          system("podman exec -w /root pgpm-deb-tmp /bin/bash -c 'fakeroot pbuilder execute --save-after-exec ./pbuilder_install_script.sh'")
+
+          system("podman stop pgpm-deb-tmp")
+          system("podman commit pgpm-deb-tmp #{image_name}")
+          system("podman container rm pgpm-deb-tmp")
+      end
+
       def generate_deb_src_files(pkg_type = :versioned)
         puts "Generating debian files..."
         Dir.mkdir "#{@pgpm_dir}/source-#{pkg_type}/debian"

lib/pgpm/deb/pbuilder_install_script.sh

@@ -7,12 +7,10 @@
 module Pgpm
   module Deb
     class Spec
-      attr_reader :package, :release, :postgres_distribution
+      attr_reader :package, :release
 
       def initialize(package)
-        @postgres_distribution = Pgpm::Postgres::Distribution.in_scope
         @package = package
-        @package.postgres_version = @postgres_distribution.version
         @release = 1
       end
 

lib/pgpm/deb/spec.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# Run this script with:
+#     fakeroot pbuilder execute --save-after-exec ./pbuilder_install_script.sh
+
+apt update
+DEBIAN_FRONTEND=noninteractive apt -y install                                   \
+  build-essential curl lsb-release ca-certificates automake autopoint           \
+  autotools-dev bsdextrautils debhelper dh-autoreconf dh-strip-nondeterminism   \
+  dwz file gettext gettext-base groff-base intltool-debian libarchive-zip-perl  \
+  libdebhelper-perl libelf1t64 libfile-stripnondeterminism-perl libmagic-mgc    \
+  libmagic1t64 libpipeline1 libtool libuchardet0 man-db po-debconf
+
+### PostgreSQL installation
+#
+install -d /usr/share/postgresql-common/pgdg
+curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+
+# Create the repository configuration file:
+sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+
+# Update the package lists:
+apt update
+
+# Install PostgreSQL. We first try a package with the full version name, but if
+# (such as postgresql-17.4), but if that's not the name that exists in the apt
+# repository, we use postgresql-17 instead.
+PG_VERSION=<%= @package.postgres_version(:major) %>
+
+# Checking if the output is empty, because `apt search` returns status 0
+# even if doesn't find anything.
+if [[ $(apt-cache search --names-only postgresql-<%= @package.postgres_version %> | head -c1 | wc -c) -ne 0 ]]; then
+  PG_VERSION=<%= @package.postgres_version %>
+fi
+
+apt -y install postgresql-$PG_VERSION            \
+               postgresql-server-dev-$PG_VERSION \
+               postgresql-common

lib/pgpm/deb/templates/pbuilder_install_script.sh.erb

@@ -11,8 +11,8 @@ def build_dependencies
         case Pgpm::OS.in_scope.class.name
         when "debian", "ubuntu"
           deps = [
-            "postgresql-#{postgres_version}",
-            "postgresql-server-dev-#{postgres_version}",
+            "postgresql-#{postgres_version(:major)}",
+            "postgresql-server-dev-#{postgres_version(:major)}",
             "postgresql-common"
           ]
           if native?
@@ -26,7 +26,7 @@ def build_dependencies
       def dependencies
         case Pgpm::OS.in_scope.class.name
         when "debian", "ubuntu"
-          ["postgresql-#{postgres_major_version}"]
+          ["postgresql-#{postgres_version(:major)}"]
         when "rocky+epel-9", "redhat", "fedora"
           []
         end
@@ -44,6 +44,14 @@ def topologically_ordered_with_dependencies
         TopologicalPackageSorter.new([self, *all_requirements]).sorted_packages
       end
 
+      def postgres_version(version_type=:major_minor)
+        v = Pgpm::Postgres::Distribution.in_scope.version
+        if version_type == :major
+          v = v.split(".").first
+        end
+        v
+      end
+
       class TopologicalPackageSorter
         include TSort
 

lib/pgpm/package/dependencies.rb

@@ -6,12 +6,11 @@
 module Pgpm
   module RPM
     class Spec
-      attr_reader :package, :release, :postgres_distribution
+      attr_reader :package, :release
 
       def initialize(package)
         @postgres_distribution = Pgpm::Postgres::Distribution.in_scope
         @package = package
-        @package.postgres_version = @postgres_distribution.version
         @release = 1
       end