HHH-15871 Update EDB testing to version 15
This commit is contained in:
parent
53c7ef470a
commit
57029ddc70
|
@ -181,7 +181,7 @@ stage('Build') {
|
||||||
state[buildEnv.tag]['containerName'] = "postgres"
|
state[buildEnv.tag]['containerName'] = "postgres"
|
||||||
break;
|
break;
|
||||||
case "edb":
|
case "edb":
|
||||||
docker.image('quay.io/enterprisedb/edb-postgres-advanced:14.5-3.2-postgis').pull()
|
docker.image('quay.io/enterprisedb/edb-postgres-advanced:15.2-3.3-postgis').pull()
|
||||||
sh "./docker_db.sh edb"
|
sh "./docker_db.sh edb"
|
||||||
state[buildEnv.tag]['containerName'] = "edb"
|
state[buildEnv.tag]['containerName'] = "edb"
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -147,7 +147,7 @@ postgresql_15() {
|
||||||
}
|
}
|
||||||
|
|
||||||
edb() {
|
edb() {
|
||||||
edb_14
|
edb_15
|
||||||
}
|
}
|
||||||
|
|
||||||
edb_10() {
|
edb_10() {
|
||||||
|
@ -164,6 +164,13 @@ edb_14() {
|
||||||
$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:14
|
$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:14
|
||||||
}
|
}
|
||||||
|
|
||||||
|
edb_15() {
|
||||||
|
$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
|
||||||
|
(cd edb; $CONTAINER_CLI build -t edb-test:15 -f edb15.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:15
|
||||||
|
}
|
||||||
|
|
||||||
db2() {
|
db2() {
|
||||||
db2_11_5
|
db2_11_5
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
FROM quay.io/enterprisedb/edb-postgres-advanced:15.2-3.3-postgis
|
||||||
|
USER root
|
||||||
|
# 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
|
||||||
|
|
||||||
|
USER postgres
|
||||||
|
ENV LANG en_US.utf8
|
||||||
|
ENV PG_MAJOR 15
|
||||||
|
ENV PG_VERSION 15
|
||||||
|
ENV PGPORT 5444
|
||||||
|
ENV PGDATA /var/lib/edb/as$PG_MAJOR/data/
|
||||||
|
VOLUME /var/lib/edb/as$PG_MAJOR/data/
|
||||||
|
|
||||||
|
COPY docker-entrypoint.sh /usr/local/bin/
|
||||||
|
ENTRYPOINT ["docker-entrypoint.sh"]
|
||||||
|
|
||||||
|
# We set the default STOPSIGNAL to SIGINT, which corresponds to what PostgreSQL
|
||||||
|
# calls "Fast Shutdown mode" wherein new connections are disallowed and any
|
||||||
|
# in-progress transactions are aborted, allowing PostgreSQL to stop cleanly and
|
||||||
|
# flush tables to disk, which is the best compromise available to avoid data
|
||||||
|
# corruption.
|
||||||
|
#
|
||||||
|
# Users who know their applications do not keep open long-lived idle connections
|
||||||
|
# may way to use a value of SIGTERM instead, which corresponds to "Smart
|
||||||
|
# Shutdown mode" in which any existing sessions are allowed to finish and the
|
||||||
|
# server stops when all sessions are terminated.
|
||||||
|
#
|
||||||
|
# See https://www.postgresql.org/docs/12/server-shutdown.html for more details
|
||||||
|
# about available PostgreSQL server shutdown signals.
|
||||||
|
#
|
||||||
|
# See also https://www.postgresql.org/docs/12/server-start.html for further
|
||||||
|
# justification of this as the default value, namely that the example (and
|
||||||
|
# shipped) systemd service files use the "Fast Shutdown mode" for service
|
||||||
|
# termination.
|
||||||
|
#
|
||||||
|
STOPSIGNAL SIGINT
|
||||||
|
#
|
||||||
|
# An additional setting that is recommended for all users regardless of this
|
||||||
|
# value is the runtime "--stop-timeout" (or your orchestrator/runtime's
|
||||||
|
# equivalent) for controlling how long to wait between sending the defined
|
||||||
|
# STOPSIGNAL and sending SIGKILL (which is likely to cause data corruption).
|
||||||
|
#
|
||||||
|
# The default in most runtimes (such as Docker) is 10 seconds, and the
|
||||||
|
# documentation at https://www.postgresql.org/docs/12/server-start.html notes
|
||||||
|
# that even 90 seconds may not be long enough in many instances.
|
||||||
|
|
||||||
|
EXPOSE 5444
|
||||||
|
CMD ["postgres"]
|
|
@ -165,7 +165,7 @@ stage('Build') {
|
||||||
state[buildEnv.tag]['containerName'] = "postgres"
|
state[buildEnv.tag]['containerName'] = "postgres"
|
||||||
break;
|
break;
|
||||||
case "edb":
|
case "edb":
|
||||||
docker.image('quay.io/enterprisedb/edb-postgres-advanced:14.5-3.2-postgis').pull()
|
docker.image('quay.io/enterprisedb/edb-postgres-advanced:15.2-3.3-postgis').pull()
|
||||||
sh "./docker_db.sh edb"
|
sh "./docker_db.sh edb"
|
||||||
state[buildEnv.tag]['containerName'] = "edb"
|
state[buildEnv.tag]['containerName'] = "edb"
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue