From 3bc102be60f44048e06a63251d7bfe551263df85 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 15 Jul 2025 15:34:59 +0900 Subject: [PATCH] Fixed PostgreSQL 17 on Ubuntu images --- Dockerfiles/build-base/ubuntu/Dockerfile | 21 ++++++++++++++++++- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 21 ++++++++++++++++++- .../web-apache-pgsql/ubuntu/Dockerfile | 21 ++++++++++++++++++- Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 21 ++++++++++++++++++- 4 files changed, 80 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 08a286d6c..dfe9d3d76 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -53,4 +53,23 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ --no-install-recommends install \ - ${INSTALL_PKGS} + gpg \ + dirmngr \ + gpg-agent && \ + DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ + echo "deb http://apt.postgresql.org/pub/repos/apt $DISTRIB_CODENAME-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' && \ + export GNUPGHOME="$(mktemp -d)" && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && \ + gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgresql.gpg && \ + gpgconf --kill all && \ + rm -rf "$GNUPGHOME" && \ + apt-get -y update && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + --no-install-recommends install \ + ${INSTALL_PKGS} && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + purge \ + gpg \ + dirmngr \ + gpg-agent diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 78b48942f..216ce80d5 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -70,15 +70,34 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ libssh-4 \ libssl3t64 \ libxml2 \ - postgresql-client \ + postgresql-client-17 \ snmp-mibs-downloader \ gzip \ unixodbc \ zlib1g" && \ apt-get -y update && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + --no-install-recommends install \ + gpg \ + dirmngr \ + gpg-agent && \ + DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ + echo "deb http://apt.postgresql.org/pub/repos/apt $DISTRIB_CODENAME-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' && \ + export GNUPGHOME="$(mktemp -d)" && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && \ + gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgresql.gpg && \ + gpgconf --kill all && \ + rm -rf "$GNUPGHOME" && \ + apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ --no-install-recommends install \ ${INSTALL_PKGS} && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + purge \ + gpg \ + dirmngr \ + gpg-agent && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index 131208e45..63b275616 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -52,14 +52,33 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ php8.3-mbstring \ php8.3-xml \ php8.3-pgsql \ - postgresql-client \ + postgresql-client-17 \ supervisor" && \ apt-get -y update && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + --no-install-recommends install \ + gpg \ + dirmngr \ + gpg-agent && \ + DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ + echo "deb http://apt.postgresql.org/pub/repos/apt $DISTRIB_CODENAME-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' && \ + export GNUPGHOME="$(mktemp -d)" && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && \ + gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgresql.gpg && \ + gpgconf --kill all && \ + rm -rf "$GNUPGHOME" && \ + apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ -o Dpkg::Options::="--force-confold" \ --no-install-recommends install \ ${INSTALL_PKGS} && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + purge \ + gpg \ + dirmngr \ + gpg-agent && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index b1d3dfd78..bef11bfa2 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -52,14 +52,33 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ php8.3-mbstring \ php8.3-xml \ php8.3-pgsql \ - postgresql-client \ + postgresql-client-17 \ supervisor" && \ apt-get -y update && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + --no-install-recommends install \ + gpg \ + dirmngr \ + gpg-agent && \ + DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ + echo "deb http://apt.postgresql.org/pub/repos/apt $DISTRIB_CODENAME-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' && \ + export GNUPGHOME="$(mktemp -d)" && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" && \ + gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgresql.gpg && \ + gpgconf --kill all && \ + rm -rf "$GNUPGHOME" && \ + apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ -o Dpkg::Options::="--force-confold" \ --no-install-recommends install \ ${INSTALL_PKGS} && \ + DEBIAN_FRONTEND=noninteractive apt-get -y \ + purge \ + gpg \ + dirmngr \ + gpg-agent && \ groupadd \ --system \ --gid 1995 \