Skip to content

Commit 3b79184

Browse files
authored
Add support for PostgreSQL 18 across various Dockerfiles and templates (#1152)
Add support for PostgreSQL 10-18 in Dockerfiles and update scripts Add support for PostgreSQL 18 in AlmaLinux and OracleLinux Dockerfiles Add PostgreSQL 18 support in AlmaLinux and OracleLinux Dockerfiles Remove PostgreSQL 18 conditional checks from various Dockerfiles and templates Update PostgreSQL version references to 18 in Dockerfiles and scripts Add support for PostgreSQL 18 in image health check and Dockerfile templates Fix logic for image name assignment in push_images script Fix condition for setting image name in update_image script Update PostgreSQL version to 18 in Dockerfiles for Ubuntu focal and noble Fix logic for image name assignment in update_image and push_images scripts Refactor Dockerfile comments for PostgreSQL 18 support and clean up variable declaration in push_images script
1 parent 27d85d6 commit 3b79184

File tree

44 files changed

+557
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+557
-63
lines changed

.github/workflows/build-package-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
- 15
5151
- 16
5252
- 17
53+
- 18
5354
include:
5455
- TARGET_PLATFORM: debian,bullseye
5556
- TARGET_PLATFORM: debian,bookworm

.github/workflows/build-package.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
- 15
5151
- 16
5252
- 17
53+
- 18
5354
include:
5455
- TARGET_PLATFORM: debian,bullseye
5556
- TARGET_PLATFORM: debian,bookworm

.github/workflows/image-health-check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
- 15
5353
- 16
5454
- 17
55+
- 18
5556
include:
5657
- TARGET_PLATFORM: debian,bullseye
5758
- TARGET_PLATFORM: debian,bookworm

ci/push_images

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -euo pipefail
55
IFS=$'\n\t'
66

7-
pgversions='12 13 14 15 16 17'
7+
pgversions='12 13 14 15 16 17 18'
88
topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.."
99
dockerfiles_dir="${topdir}/dockerfiles"
1010

dockerfiles/almalinux-8-pg11/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge
7575

7676
# install build tools and PostgreSQL development files
7777
RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
78-
&& ( [[ 11 != 17 ]] || sed -i '/\[pgdg17-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \
7978
&& [[ -z "epel-release" ]] || yum install -y epel-release) \
8079
&& yum groupinstall -y 'Development Tools' \
8180
&& yum install -y \

dockerfiles/almalinux-8-pg12/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge
7575

7676
# install build tools and PostgreSQL development files
7777
RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
78-
&& ( [[ 12 != 17 ]] || sed -i '/\[pgdg17-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \
7978
&& [[ -z "epel-release" ]] || yum install -y epel-release) \
8079
&& yum groupinstall -y 'Development Tools' \
8180
&& yum install -y \

dockerfiles/almalinux-8-pg13/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge
7575

7676
# install build tools and PostgreSQL development files
7777
RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
78-
&& ( [[ 13 != 17 ]] || sed -i '/\[pgdg17-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \
7978
&& [[ -z "epel-release" ]] || yum install -y epel-release) \
8079
&& yum groupinstall -y 'Development Tools' \
8180
&& yum install -y \

dockerfiles/almalinux-8-pg14/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge
7575

7676
# install build tools and PostgreSQL development files
7777
RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
78-
&& ( [[ 14 != 17 ]] || sed -i '/\[pgdg17-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \
7978
&& [[ -z "epel-release" ]] || yum install -y epel-release) \
8079
&& yum groupinstall -y 'Development Tools' \
8180
&& yum install -y \

dockerfiles/almalinux-8-pg15/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge
7575

7676
# install build tools and PostgreSQL development files
7777
RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
78-
&& ( [[ 15 != 17 ]] || sed -i '/\[pgdg17-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \
7978
&& [[ -z "epel-release" ]] || yum install -y epel-release) \
8079
&& yum groupinstall -y 'Development Tools' \
8180
&& yum install -y \

dockerfiles/almalinux-8-pg16/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge
7575

7676
# install build tools and PostgreSQL development files
7777
RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \
78-
&& ( [[ 16 != 17 ]] || sed -i '/\[pgdg17-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \
7978
&& [[ -z "epel-release" ]] || yum install -y epel-release) \
8079
&& yum groupinstall -y 'Development Tools' \
8180
&& yum install -y \

0 commit comments

Comments
 (0)