Add Ubuntu 24.04

Author: juliogonzalez

README.md

@@ -5,6 +5,7 @@ Current distributions available:
 * openSUSE Leap 15.6
 * Rocky Linux 8
 * Ubuntu 20.04
+* Ubuntu 24.04
 
 Current PostgreSQL versions available:
 

manage_images

@@ -7,7 +7,7 @@ LANG=en_EN
 SCRIPT=$(basename ${0})
 
 # Supported distributions and PostgreSQL versions
-SUPPORTEDDISTROS="rockylinux8 ubuntu20.04 opensuseleap15.6"
+SUPPORTEDDISTROS="rockylinux8 ubuntu20.04 ubuntu24.04 opensuseleap15.6"
 SUPPORTEDPGVERS="9.3 9.4 9.5 9.6 10 11 12 13 14 15 16"
 
 # Ignored combinations, will exit without errors so the CI does not fail

ubuntu24.04/Dockerfile

@@ -0,0 +1,80 @@
+FROM docker.io/ubuntu:24.04
+MAINTAINER Julio Gonzalez Gil <git@juliogonzalez.es>
+
+USER root
+
+# Set locale (will be used by PostgreSQL initdb later on)
+# Also install gnupg2, to be used by apt-key later on (apt-key does not have a explicit dependency)
+RUN apt-get -qq -o=Dpkg::Use-Pty=0 update > /dev/null && \
+    apt-get -qq -o=Dpkg::Use-Pty=0 -y install locales gnupg2 && \
+    apt-get -qq -o=Dpkg::Use-Pty=0 clean > /dev/null && \
+    DEBIAN_FRONTEND=noninteractive locale-gen en_US.UTF-8 && \
+    DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales && \
+    update-locale LANG=en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+
+# Default UID/GID for mounting folders (used at jenkins slaves)
+ARG UID=500
+ARG GID=500
+
+# Create postgres group and user according to arguments UID/GID
+RUN groupadd -g ${GID} postgres
+RUN useradd -d /var/lib/postgresql -u ${UID} -g ${GID} postgres && mkdir /var/lib/postgresql && chown postgres:postgres /var/lib/postgresql
+
+# Create the wrappers to start PostgreSQL and check for PostgreSQL Updates
+ADD files/*.sh /opt/
+
+# PostgreSQL arguments
+# Default version
+ARG POSTGRESQL_VER=9.5
+ENV POSTGRESQL_VER=${POSTGRESQL_VER}
+ARG POSTGRESQL_TESTING=0
+ENV POSTGRESQL_TESTING=${POSTGRESQL_TESTING}
+
+# Pass the output of date command as DATE argument if you want 
+# make sure that the image is generated using the lastest 
+# PostgreSQL packages (cache will be used for previous steps)
+ARG DATE=None
+
+# Add the PostgreSQL PGP key to verify their Debian packages and install them
+# Key should be the same as https://www.postgresql.org/media/keys/ACCC4CF8.asc
+# Then generate a list of original packages, upgrade and install PostgreSQL
+RUN dpkg --get-selections | grep 'install' | grep -v 'deinstall'|cut -f1 > /opt/packages-image.txt && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 && \
+    apt-get -qq -o=Dpkg::Use-Pty=0 update > /dev/null && \
+    LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive apt-get -qq -o=Dpkg::Use-Pty=0 -y install ca-certificates && \
+    LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive apt-get -qq -o=Dpkg::Use-Pty=0 -y dist-upgrade > /dev/null && \
+    [ ${POSTGRESQL_TESTING} -eq 1 ] && TESTING="-testing"; echo "deb https://download.postgresql.org/pub/repos/apt/ focal-pgdg${testing} ${POSTGRESQL_VER} main" >> /etc/apt/sources.list.d/pgdg.list && \
+    apt-get -qq -o=Dpkg::Use-Pty=0 update > /dev/null && \
+    LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive apt-get -qq -o=Dpkg::Use-Pty=0 -y install \
+     postgresql-${POSTGRESQL_VER} \
+     postgresql-client-${POSTGRESQL_VER} \
+     postgresql-server-dev-${POSTGRESQL_VER} > /dev/null && \
+    apt-get -qq -o=Dpkg::Use-Pty=0 clean > /dev/null # ${DATE}
+
+# Allow PostgreSQL password acess from localhost
+RUN sed -i -r -e 's/host\s+all\s+all\s+127.0.0.1\/32\s+md5/host all all 127.0.0.1\/32 password/' /etc/postgresql/${POSTGRESQL_VER}/main/pg_hba.conf
+
+# Configure temporary dir
+RUN mkdir -p /var/run/postgresql/${POSTGRESQL_VER}-main.pg_stat_tmp && chown postgres:postgres /var/run/postgresql/${POSTGRESQL_VER}-main.pg_stat_tmp
+
+# Expose the PostgreSQL port
+EXPOSE 5432
+
+# Seems there is a problem with the latest openSUSE MicroOS as if
+# userns is used to launch the container, the /var/log/postgresql
+# is owned by UID/GID 1002 which does not exist on the container or
+# the OS
+# I still could not find where the issue is, but we do not need to
+# do anything for Ubuntu, unlike for other OS, as rights are
+# 755 already
+
+# Add VOLUMEs to allow backup of config, logs and databases
+VOLUME  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
+
+USER postgres
+
+CMD ["/bin/bash", "/opt/start_postgresql.sh"]

ubuntu24.04/files/check_updates.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+# This script will check for package upgrades and will return:
+# - 0 if no upgrades were available
+# - 1 if upgrades were available for at least one package not present at parent
+#     image
+# - 2 if upgrades were available for at least one packages at parent image
+# - 3 if upgrades were available fot at least one package not present at parent
+#     image, and at least one present at the parent image
+
+PACKAGES_ORIG='/opt/packages-image.txt'
+PACKAGES_UPDATES='/opt/packages-updates.txt'
+
+apt-get -qq -o=Dpkg::Use-Pty=0 update > /dev/null
+apt-get -s dist-upgrade | awk '/^Inst/ { print $2 }' > ${PACKAGES_UPDATES}
+
+EXIT=0
+PFOUND=0
+CFOUND=0
+PPACKAGES_UPDATES=''
+CPACKAGES_UPDATES=''
+
+while read UPDATE; do
+  FOUND=0
+  while read ORIGINAL; do
+    if [ "${UPDATE}" == "${ORIGINAL}" ]; then
+      FOUND=1
+      PPACKAGES_UPDATES="${PPACKAGES_UPDATES} ${UPDATE}"
+    fi
+  done < ${PACKAGES_ORIG}
+  if [ $FOUND -eq 1 ]; then
+    PFOUND=2
+  else
+    CFOUND=1
+    CPACKAGES_UPDATES="${CPACKAGES_UPDATES} ${UPDATE}"
+  fi
+done < ${PACKAGES_UPDATES}
+
+if [ "${PPACKAGES_UPDATES}" != "" ]; then
+  echo "=================================================================="
+  echo "            PACKAGES FROM PARENT IMAGE REQUIRING UPDATE"
+  echo "=================================================================="
+  for PACKAGE in ${PPACKAGES_UPDATES}; do
+    echo "${PACKAGE}"
+  done;
+fi
+
+if [ "${CPACKAGES_UPDATES}" != "" ]; then
+  echo "=================================================================="
+  echo "           PACKAGES FROM CURRENT IMAGE REQUIRING UPDATE"
+  echo "=================================================================="
+  for PACKAGE in ${CPACKAGES_UPDATES}; do
+    echo "${PACKAGE}"
+  done;
+fi
+
+exit $((${EXIT}+${PFOUND}+${CFOUND}))

ubuntu24.04/files/start_postgresql.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+DB_NAME=${DB_NAME:-}
+DB_PASS=${DB_PASS:-}
+
+DB_USER='postgresql'
+PG_VER="${POSTGRESQL_VER}"
+PG_PATH="/usr/lib/postgresql/${PG_VER}/bin"
+DB_PATH="/var/lib/postgresql/${PG_VER}/main"
+ETC_PATH="/etc/postgresql/${PG_VER}/main"
+
+# Start service with pg_ctl
+${PG_PATH}/pg_ctl -w start -D ${DB_PATH} -o "-c config_file=${ETC_PATH}/postgresql.conf"
+
+# Create database if needed
+if [ ! -z "${DB_NAME}" ]; then
+  if ! ${PG_PATH}/psql -c "SELECT 1 FROM pg_database WHERE datname='${DB_NAME}'" | grep -q 1; then
+    echo "Creating database \"${DB_NAME}\"..."
+    ${PG_PATH}/psql -c "CREATE DATABASE ${DB_NAME}"
+  else
+    echo "Warning: Database \"${DB_NAME}\" was already created!"
+  fi
+fi
+
+# Create role if needed
+if ! ${PG_PATH}/psql -c "SELECT 1 FROM pg_roles WHERE rolname='${DB_USER}'" | grep -q 1; then
+  echo "Creating user \"${DB_USER}\"..."
+  if [ -z "${DB_PASS}" ]; then
+    DB_PASS=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo;)
+    echo "WARNING: No password specified. Random password created: \"${DB_PASS}\""
+  fi
+  ${PG_PATH}/psql -c "CREATE ROLE ${DBUSERNAME} SUPERUSER LOGIN PASSWORD '${DBPASSWORD}'"
+elif [ ! -z "${DB_PASS}" ]; then
+  echo "Warning: User \"${DB_USER}\" was already created!"
+fi
+
+# Stop service with pg_ctl and start it with postmaster
+${PG_PATH}/pg_ctl -w stop -D ${DB_PATH} -o "-c config_file=${ETC_PATH}/postgresql.conf"
+
+echo "Starting PostgreSQL ${PG_VER}..."
+${PG_PATH}/postgres -D ${DB_PATH} --config_file=${ETC_PATH}/postgresql.conf >> /var/log/postgresql/postgresql-${PG_VER}-main.log 2>&1