Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15194 - Remove support for PostgreSQL Advanced Server versions older than 11 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2023-08-16 19:09:23 +02:00 committed by Christian Beikov
parent 213660001c
commit b241502b59
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jenkinsfile vendored
View File

@ -179,11 +179,6 @@ stage('Build') {
sh "./docker_db.sh edb" sh "./docker_db.sh edb"
state[buildEnv.tag]['containerName'] = "edb" state[buildEnv.tag]['containerName'] = "edb"
break; break;
case "edb_10":
docker.image('quay.io/enterprisedb/edb-postgres-advanced:10.22').pull()
sh "./docker_db.sh edb_10"
state[buildEnv.tag]['containerName'] = "edb"
break;
case "oracle": case "oracle":
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
docker.image('gvenzl/oracle-xe:21.3.0-full').pull() docker.image('gvenzl/oracle-xe:21.3.0-full').pull()

6
docker_db.sh
View File

@ -145,11 +145,11 @@ edb() {
edb_15 edb_15
} }
edb_10() { edb_11() {
$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:10 -f edb10.Dockerfile .) (cd edb; $CONTAINER_CLI build -t edb-test:11 -f edb11.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:10 $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
} }
edb_14() { edb_14() {

12
edb/edb10.Dockerfile → edb/edb11.Dockerfile
View File

@ -1,16 +1,12 @@
FROM quay.io/enterprisedb/edb-postgres-advanced:10.22 FROM quay.io/enterprisedb/edb-postgres-advanced:11.20-3.3-postgis
USER root USER root
RUN chown -R postgres:postgres /var/lib/edb && chmod 777 /var/lib/edb && mkdir /docker-entrypoint-initdb.d
#FROM quay.io/enterprisedb/edb-postgres-advanced:11.17-3.2-postgis
#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 10 ENV PG_MAJOR 11
ENV PG_VERSION 10 ENV PG_VERSION 11
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/

8
nightly.Jenkinsfile
View File

@ -33,7 +33,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_11' ), new BuildEnvironment( dbName: 'postgresql_11' ),
new BuildEnvironment( dbName: 'edb_10' ), new BuildEnvironment( dbName: 'edb_11' ),
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
@ -171,9 +171,9 @@ stage('Build') {
sh "./docker_db.sh edb" sh "./docker_db.sh edb"
state[buildEnv.tag]['containerName'] = "edb" state[buildEnv.tag]['containerName'] = "edb"
break; break;
case "edb_10": case "edb_11":
docker.image('quay.io/enterprisedb/edb-postgres-advanced:10.22').pull() docker.image('quay.io/enterprisedb/edb-postgres-advanced:11.20-3.3-postgis').pull()
sh "./docker_db.sh edb_10" sh "./docker_db.sh edb_11"
state[buildEnv.tag]['containerName'] = "edb" state[buildEnv.tag]['containerName'] = "edb"
break; break;
case "oracle": case "oracle":