HHH-17092 - Remove support for PostgreSQL Advanced Server versions older than 12

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2023-10-11 20:42:59 +02:00 committed by Christian Beikov
parent 90485c2b78
commit 83a1fa7f56
3 changed files with 11 additions and 11 deletions

View File

@ -193,11 +193,11 @@ edb() {
edb_15 edb_15
} }
edb_11() { edb_12() {
$CONTAINER_CLI rm -f edb || true $CONTAINER_CLI rm -f edb || true
# We need to build a derived image because the existing image is mainly made for use by a kubernetes operator # We need to build a derived image because the existing image is mainly made for use by a kubernetes operator
(cd edb; $CONTAINER_CLI build -t edb-test:11 -f edb11.Dockerfile .) (cd edb; $CONTAINER_CLI build -t edb-test:12 -f edb12.Dockerfile .)
$CONTAINER_CLI run --name edb -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p 5444:5444 -d edb-test:11 $CONTAINER_CLI run --name edb -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p 5444:5444 -d edb-test:12
} }
edb_14() { edb_14() {
@ -1059,7 +1059,7 @@ if [ -z ${1} ]; then
echo -e "\tedb" echo -e "\tedb"
echo -e "\tedb_15" echo -e "\tedb_15"
echo -e "\tedb_14" echo -e "\tedb_14"
echo -e "\tedb_11" echo -e "\tedb_12"
echo -e "\thana" echo -e "\thana"
echo -e "\tmariadb" echo -e "\tmariadb"
echo -e "\tmariadb_11_1" echo -e "\tmariadb_11_1"

View File

@ -1,12 +1,12 @@
FROM quay.io/enterprisedb/edb-postgres-advanced:11.21-3.3-postgis FROM quay.io/enterprisedb/edb-postgres-advanced:12.16-3.3-postgis
USER root USER root
# this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values) # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
RUN chown -R postgres:postgres /var/lib/edb && chmod 777 /var/lib/edb && rm /docker-entrypoint-initdb.d/10_postgis.sh RUN chown -R postgres:postgres /var/lib/edb && chmod 777 /var/lib/edb && rm /docker-entrypoint-initdb.d/10_postgis.sh
USER postgres USER postgres
ENV LANG en_US.utf8 ENV LANG en_US.utf8
ENV PG_MAJOR 11 ENV PG_MAJOR 12
ENV PG_VERSION 11 ENV PG_VERSION 12
ENV PGPORT 5444 ENV PGPORT 5444
ENV PGDATA /var/lib/edb/as$PG_MAJOR/data/ ENV PGDATA /var/lib/edb/as$PG_MAJOR/data/
VOLUME /var/lib/edb/as$PG_MAJOR/data/ VOLUME /var/lib/edb/as$PG_MAJOR/data/

View File

@ -31,7 +31,7 @@ stage('Configure') {
new BuildEnvironment( dbName: 'mysql_5_7' ), new BuildEnvironment( dbName: 'mysql_5_7' ),
new BuildEnvironment( dbName: 'mariadb_10_3' ), new BuildEnvironment( dbName: 'mariadb_10_3' ),
new BuildEnvironment( dbName: 'postgresql_12' ), new BuildEnvironment( dbName: 'postgresql_12' ),
new BuildEnvironment( dbName: 'edb_11' ), new BuildEnvironment( dbName: 'edb_12' ),
new BuildEnvironment( dbName: 'oracle_11_2' ), new BuildEnvironment( dbName: 'oracle_11_2' ),
new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ), new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ),
new BuildEnvironment( dbName: 'mssql_2017' ), // Unfortunately there is no SQL Server 2008 image, so we have to test with 2017 new BuildEnvironment( dbName: 'mssql_2017' ), // Unfortunately there is no SQL Server 2008 image, so we have to test with 2017
@ -132,9 +132,9 @@ stage('Build') {
sh "./docker_db.sh postgresql_12" sh "./docker_db.sh postgresql_12"
state[buildEnv.tag]['containerName'] = "postgres" state[buildEnv.tag]['containerName'] = "postgres"
break; break;
case "edb_11": case "edb_12":
docker.image('quay.io/enterprisedb/edb-postgres-advanced:11.21-3.3-postgis').pull() docker.image('quay.io/enterprisedb/edb-postgres-advanced:12.16-3.3-postgis').pull()
sh "./docker_db.sh edb_11" sh "./docker_db.sh edb_12"
state[buildEnv.tag]['containerName'] = "edb" state[buildEnv.tag]['containerName'] = "edb"
break; break;
case "oracle_11_2": case "oracle_11_2":