remove bionic and focal from build matrix

ihalatci · ihalatci · commit ab5fd0fb3376 · 2026-01-24T08:42:06.000Z
diff --git a/.github/workflows/image-health-check.yml b/.github/workflows/image-health-check.yml
@@ -55,9 +55,6 @@ jobs:
           - TARGET_PLATFORM: debian,bullseye
           - TARGET_PLATFORM: debian,bookworm
           - TARGET_PLATFORM: debian,trixie
-          # removing temporarily since postgres 16 packages does not exist for ubuntu bionic
-          - TARGET_PLATFORM: ubuntu,bionic
-          - TARGET_PLATFORM: ubuntu,focal
           - TARGET_PLATFORM: ubuntu,jammy
           - TARGET_PLATFORM: ubuntu,noble
           - TARGET_PLATFORM: pgxn
diff --git a/dockerfiles/debian-bookworm-all/Dockerfile b/dockerfiles/debian-bookworm-all/Dockerfile
@@ -44,7 +44,7 @@ RUN ( [ debian != debian ] || [ bookworm != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main 18' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
@@ -103,10 +103,6 @@ RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
 RUN curl https://install.citusdata.com/community/deb.sh | bash \
     && rm -rf /var/lib/apt/lists/*
 
-# patch pg_buildext to use multiple processors
-COPY make_pg_buildext_parallel.patch /
-RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
-
 
 # install cmake from source
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
diff --git a/dockerfiles/debian-bullseye-all/Dockerfile b/dockerfiles/debian-bullseye-all/Dockerfile
@@ -44,7 +44,7 @@ RUN ( [ debian != debian ] || [ bullseye != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main 18' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
@@ -103,10 +103,6 @@ RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
 RUN curl https://install.citusdata.com/community/deb.sh | bash \
     && rm -rf /var/lib/apt/lists/*
 
-# patch pg_buildext to use multiple processors
-COPY make_pg_buildext_parallel.patch /
-RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
-
 
 # install cmake from source
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
diff --git a/dockerfiles/debian-buster-all/Dockerfile b/dockerfiles/debian-buster-all/Dockerfile
@@ -44,7 +44,7 @@ RUN ( [ debian != debian ] || [ buster != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main 17' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
diff --git a/dockerfiles/debian-trixie-all/Dockerfile b/dockerfiles/debian-trixie-all/Dockerfile
@@ -44,7 +44,7 @@ RUN ( [ debian != debian ] || [ trixie != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main 18' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
@@ -103,10 +103,6 @@ RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
 RUN curl https://install.citusdata.com/community/deb.sh | bash \
     && rm -rf /var/lib/apt/lists/*
 
-# patch pg_buildext to use multiple processors
-COPY make_pg_buildext_parallel.patch /
-RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
-
 
 # install cmake from source
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
@@ -132,7 +128,7 @@ RUN set -ex \
 
 
 # Added for pg18  package support.
-ENV DEB_PG_SUPPORTED_VERSIONS="17 18"
+ENV DEB_PG_SUPPORTED_VERSIONS="14 15 16 17 18"
 
 # place scripts on path and declare output volume
 ENV PATH /scripts:$PATH
diff --git a/dockerfiles/ubuntu-bionic-all/Dockerfile b/dockerfiles/ubuntu-bionic-all/Dockerfile
@@ -1,4 +1,5 @@
 # vim:set ft=dockerfile:
+# NOTE: PGDG apt repo for bionic removed (404 Release); retained for reference only.
 FROM ubuntu:bionic
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -44,7 +45,7 @@ RUN ( [ ubuntu != debian ] || [ bionic != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main 17' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
diff --git a/dockerfiles/ubuntu-focal-all/Dockerfile b/dockerfiles/ubuntu-focal-all/Dockerfile
@@ -1,4 +1,5 @@
 # vim:set ft=dockerfile:
+# NOTE: PGDG apt repo for focal removed (2026); this image is retained for reference but not buildable.
 FROM ubuntu:focal
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -44,7 +45,7 @@ RUN ( [ ubuntu != debian ] || [ focal != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main 18' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
diff --git a/dockerfiles/ubuntu-jammy-all/Dockerfile b/dockerfiles/ubuntu-jammy-all/Dockerfile
@@ -44,7 +44,7 @@ RUN ( [ ubuntu != debian ] || [ jammy != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main 18' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
@@ -103,10 +103,6 @@ RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
 RUN curl https://install.citusdata.com/community/deb.sh | bash \
     && rm -rf /var/lib/apt/lists/*
 
-# patch pg_buildext to use multiple processors
-COPY make_pg_buildext_parallel.patch /
-RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
-
 
 # install cmake from source
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
diff --git a/dockerfiles/ubuntu-noble-all/Dockerfile b/dockerfiles/ubuntu-noble-all/Dockerfile
@@ -44,7 +44,7 @@ RUN ( [ ubuntu != debian ] || [ noble != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main 18' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
@@ -103,10 +103,6 @@ RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
 RUN curl https://install.citusdata.com/community/deb.sh | bash \
     && rm -rf /var/lib/apt/lists/*
 
-# patch pg_buildext to use multiple processors
-COPY make_pg_buildext_parallel.patch /
-RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
-
 
 # install cmake from source
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
diff --git a/os-list.csv b/os-list.csv
@@ -5,7 +5,6 @@ debian,bookworm
 debian,trixie
 oraclelinux,8
 oraclelinux,6
-ubuntu,focal
 ubuntu,jammy
 ubuntu,noble
 pgxn
diff --git a/templates/Dockerfile-deb.tmpl b/templates/Dockerfile-deb.tmpl
@@ -44,7 +44,7 @@ RUN ( [ %%os%% != debian ] || [ %%release%% != buster ] ) || ( \
 
 # install build tools and PostgreSQL development files
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ %%release%%-pgdg main 18' > /etc/apt/sources.list.d/pgdg.list \
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ %%release%%-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         autotools-dev \
@@ -103,10 +103,6 @@ RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
 RUN curl https://install.citusdata.com/community/deb.sh | bash \
     && rm -rf /var/lib/apt/lists/*
 
-# patch pg_buildext to use multiple processors
-COPY make_pg_buildext_parallel.patch /
-RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
-
 
 # install cmake from source
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
diff --git a/update_image b/update_image
@@ -9,7 +9,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-pgversions='11 12 13 14 15 16 17 18'
+pgversions='14 15 16 17 18'
 topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 dockerfiles_dir="${topdir}/dockerfiles"
 
@@ -27,6 +27,11 @@ fi
 
 IFS=',' read -r os release <<< "${TARGET_PLATFORM}"
 
+if [[ "${os},${release}" =~ ^ubuntu,(focal|bionic)$ ]]; then
+    echo "${TARGET_PLATFORM} unsupported: PGDG apt repo for ${release} is no longer available" >&2
+    exit 1
+fi
+
 if [[ "${os}" = 'debian' ]] || [[ "${os}" = 'ubuntu' ]]; then
     tag="${os}-${release}-all"
     args+="build --pull --no-cache -t citus/${image_name}:${tag} -f ${dockerfiles_dir}/${tag}/Dockerfile .\n"
