HHH-15615 Add EDB PostgreSQL Advanced to test matrix and fix issues

Author: beikov

.github/workflows/contributor-build.yml

@@ -43,6 +43,7 @@ jobs:
           - rdbms: mariadb
           - rdbms: postgresql
           - rdbms: postgresql_14
+          - rdbms: edb
           - rdbms: oracle
           - rdbms: db2
           - rdbms: mssql

Jenkinsfile

@@ -34,6 +34,7 @@ stage('Configure') {
 //		new BuildEnvironment( dbName: 'mariadb' ),
 //		new BuildEnvironment( dbName: 'postgresql' ),
 //		new BuildEnvironment( dbName: 'postgresql_14' ),
+//		new BuildEnvironment( dbName: 'edb' ),
 //		new BuildEnvironment( dbName: 'oracle' ),
 //		new BuildEnvironment( dbName: 'db2' ),
 //		new BuildEnvironment( dbName: 'mssql' ),
@@ -194,12 +195,7 @@ stage('Build') {
 									state[buildEnv.tag]['containerName'] = "sybase"
 									break;
 								case "edb":
-									docker.withRegistry('https://containers.enterprisedb.com', 'hibernateci.containers.enterprisedb.com') {
-		// 							withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'hibernateci.containers.enterprisedb.com',
-		// 								usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-		// 							  	sh 'docker login -u "$USERNAME" -p "$PASSWORD" https://containers.enterprisedb.com'
-										docker.image('containers.enterprisedb.com/edb/edb-as-lite:v11').pull()
-									}
+									docker.image('quay.io/enterprisedb/edb-postgres-advanced:10.22').pull()
 									sh "./docker_db.sh edb"
 									state[buildEnv.tag]['containerName'] = "edb"
 									break;

ci/build.sh

@@ -7,7 +7,7 @@ if [ "$RDBMS" == "h2" ]; then
 elif [ "$RDBMS" == "derby" ]; then
   goal="-Pdb=derby"
 elif [ "$RDBMS" == "edb" ]; then
-  goal="-Pdb=edb_ci"
+  goal="-Pdb=edb_ci -DdbHost=localhost:5444"
 elif [ "$RDBMS" == "hsqldb" ]; then
   goal="-Pdb=hsqldb"
 elif [ "$RDBMS" == "mysql8" ]; then

ci/database-start.sh

@@ -12,6 +12,8 @@ elif [ "$RDBMS" == 'postgresql' ]; then
   bash $DIR/../docker_db.sh postgresql
 elif [ "$RDBMS" == 'postgresql_14' ]; then
   bash $DIR/../docker_db.sh postgresql_14
+elif [ "$RDBMS" == 'edb' ]; then
+  bash $DIR/../docker_db.sh edb
 elif [ "$RDBMS" == 'db2' ]; then
   bash $DIR/../docker_db.sh db2
 elif [ "$RDBMS" == 'oracle' ]; then

docker_db.sh

@@ -115,9 +115,15 @@ postgresql_14() {
 }
 
 edb() {
-    #$CONTAINER_CLI login containers.enterprisedb.com
+    edb_10
+}
+
+edb_10() {
     $CONTAINER_CLI rm -f edb || true
-    $CONTAINER_CLI run --name edb -e ACCEPT_EULA=Yes -e DATABASE_USER=hibernate_orm_test -e DATABASE_USER_PASSWORD=hibernate_orm_test -e ENTERPRISEDB_PASSWORD=hibernate_orm_test -e DATABASE_NAME=hibernate_orm_test -e PGPORT=5433 -p 5433:5433 --mount type=tmpfs,destination=/edbvolume -d containers.enterprisedb.com/edb/edb-as-lite:v11
+    # The version of the base image can be seen and updated in ./edb/Dockerfile
+    # 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:latest .)
+    $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:latest
 }
 
 db2() {

edb/Dockerfile

@@ -0,0 +1,52 @@
+FROM quay.io/enterprisedb/edb-postgres-advanced:10.22
+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)
+#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 10
+ENV PG_VERSION 10
+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"]