1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-09-16 09:06:18 +02:00

New CI container build for PostgreSQL 18 beta1.

Since the addition of libcurl4-openssl-dev requires a rebuild of the Debian containers go ahead and rebuild all containers to include new PostgreSQL minor release versions.
This commit is contained in:
David Steele
2025-05-09 17:45:05 -04:00
parent 34b916f323
commit 7b1b1f5322
2 changed files with 17 additions and 21 deletions

View File

@@ -12,19 +12,16 @@
# - docker login -u pgbackrest
# - DATE=YYYYMMDDX;VM=X;ARCH=X;BASE=pgbackrest/test:${VM?}-base-${ARCH?};docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
# **********************************************************************************************************************************
20250413A:
20250509A:
ppc64le:
u22: a07ecf5a76b633c1c0c54ba4a836ed4c19f710b6
u22: b6461e07d86205488f861ad25e7a46442c2ee990
s390x:
u22: 535e05dc96aa24dd93b8801ed213c13d9d7a0ee4
u22: cbdcbaca3e7e0642cdd379f80574e3f1a87d3924
x86_64:
u22: 3a2bd0b5842fd97cf4f67ecc990816efc78cb799
20250228A:
x86_64:
d11: 01e6970744c2b2529a14832e92cb861c7da94308
d11: be044bf120ca3e7d8bed69d5a83b4de4926be87f
f41: ce870455184e991e0efd90176da1412f0f3f72a2
rh8: 4d141c845abfbdbf402ba447cf2bd2e4357c8a63
u20: 862159b4d2169a4752b106639ca0f47c1ebb1f86
u20: d9618e4e2380da312152cf672ff56cfb8ec8abe2
u22: 8feb0a70d1614b6873887e0bb3d99ef7016663eb

View File

@@ -423,7 +423,7 @@ sub containerBuild
" libyaml-libyaml-perl tzdata devscripts lintian libxml-checker-perl txt2man debhelper \\\n" .
" libppi-html-perl libtemplate-perl libtest-differences-perl zlib1g-dev libxml2-dev pkg-config \\\n" .
" libbz2-dev bzip2 libyaml-dev libjson-pp-perl liblz4-dev liblz4-tool gnupg lsb-release ccache meson \\\n" .
" libssh2-1-dev";
" libssh2-1-dev libcurl4-openssl-dev";
if ($strOS eq VM_U20 || $strOS eq VM_U22)
{
@@ -497,18 +497,15 @@ sub containerBuild
{
$strScript .=
" echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg main" .
"\" >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
($strOS eq VM_U22 ?
" echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg-snapshot main" .
" 18\" >> /etc/apt/sources.list.d/pgdg.list && \\\n" : '') .
($strOS eq VM_U22 && ($strArch eq VM_ARCH_AARCH64 || $strArch eq VM_ARCH_X86_64) ? ' 18' : '') .
"\" >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
" wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \\\n" .
" apt-get update && \\\n";
}
$strScript .=
" apt-get install -y --no-install-recommends" .
($strOS eq VM_U22 ? " -t \$(lsb_release -s -c)-pgdg-snapshot" : '') . " postgresql-common libpq-dev && \\\n" .
" sed -i 's/^\\#create\\_main\\_cluster.*\$/create\\_main\\_cluster \\= false/' " .
" apt-get install -y --no-install-recommends postgresql-common libpq-dev && \\\n" .
" sed -i 's/^\\#create\\_main\\_cluster.*\$/create\\_main\\_cluster \\= false/' " .
"/etc/postgresql-common/createcluster.conf";
}
@@ -523,10 +520,8 @@ sub containerBuild
}
else
{
$strScript .=
" apt-get install -y --no-install-recommends" .
($strOS eq VM_U22 ? " -t \$(lsb_release -s -c)-pgdg-snapshot" : '');
}
$strScript .= " apt-get install -y --no-install-recommends";
}
# Construct list of databases to install
foreach my $strDbVersion (@{$oOS->{&VM_DB}})
@@ -546,6 +541,10 @@ sub containerBuild
}
else
{
# Disable PostgreSQL 18 on architectures that do not support it yet
next if ($strDbVersion eq '18' &&
!($strOS eq VM_U22 && ($strArch eq VM_ARCH_AARCH64 || $strArch eq VM_ARCH_X86_64)));
$strScript .= " postgresql-${strDbVersion}";
}
}