Fixing build for Jammy, removing build from focal due to older libc

Author: rustprooflabs

build/build.sh

@@ -35,7 +35,8 @@ echo "PGX Version: ${PGXVERSION}"
 mkdir -p ${LOGDIR}
 mkdir -p ${ARTIFACTDIR}
 
-for image in `ls docker/ ` ; do
+# Skipping focal for now, fails.
+for image in `ls docker/ | grep jammy ` ; do
 
     OS_DIST=$(echo ${image}|cut -f2 -d-)
     OS_VER=$(echo ${image}|cut -f3 -d-)

build/docker/pgdd-ubuntu-focal/Dockerfile

@@ -25,11 +25,12 @@ RUN apt-get install -y --fix-missing \
         libldap2-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \
         libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \
         ruby ruby-dev rubygems \
-        postgresql-server-dev-10 \
-        postgresql-server-dev-11 \
-        postgresql-server-dev-12 \
-        postgresql-server-dev-13 \
-        postgresql-server-dev-14
+        postgresql-10 postgresql-server-dev-10 \
+        postgresql-11 postgresql-server-dev-11 \
+        postgresql-12 postgresql-server-dev-12 \
+        postgresql-13 postgresql-server-dev-13 \
+        postgresql-14 postgresql-server-dev-14 \
+    && apt autoremove -y
 
 
 RUN gem install --no-document fpm
@@ -43,4 +44,3 @@ ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
 
 RUN /bin/bash rustup.sh -y \
     && cargo install cargo-pgx --version ${PGXVERSION}
-

build/docker/pgdd-ubuntu-jammy/Dockerfile

@@ -25,11 +25,11 @@ RUN apt-get install -y --fix-missing \
         libldap-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \
         libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \
         ruby ruby-dev rubygems \
-        postgresql-server-dev-10 \
-        postgresql-server-dev-11 \
-        postgresql-server-dev-12 \
-        postgresql-server-dev-13 \
-        postgresql-server-dev-14 \
+        postgresql-10 postgresql-server-dev-10 \
+        postgresql-11 postgresql-server-dev-11 \
+        postgresql-12 postgresql-server-dev-12 \
+        postgresql-13 postgresql-server-dev-13 \
+        postgresql-14 postgresql-server-dev-14 \
     && apt autoremove -y
 
 

build/package.sh

@@ -1,6 +1,6 @@
 # Borrowed heavily from https://github.com/zombodb/zombodb/blob/master/build/package.sh
 #
-# Copyright 2021 RustProof Labs
+# Copyright 2021-2022 RustProof Labs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,8 +27,12 @@ fi
 
 PKG_FORMAT=deb
 
-echo "    Running pgx init for ${PG_VER}"
-$(cargo pgx init --${PG_VER} download)
+PG_VER_SHORT=${PG_VER: -2}
+echo "    Running pgx init for ${PG_VER} (${PG_VER_SHORT})"
+
+mkdir -p /home/docker/.pgx/data-${PG_VER_SHORT} 
+
+cargo pgx init --${PG_VER} /usr/lib/postgresql/${PG_VER_SHORT}/bin/pg_config
 
 echo "Changing to build dir..."
 cd /build