From da6c4df5ecad0ea05d59f790b765c23be7cae9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Muzik=C3=A1=C5=99?= Date: Mon, 15 Dec 2025 07:36:26 +0100 Subject: [PATCH] Support EDB 18 (#44856) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Support EDB 18 Closes #44494 Signed-off-by: Václav Muzikář * Update test-framework/db-edb/container/README.md Co-authored-by: Steven Hawkins Signed-off-by: Václav Muzikář --------- Signed-off-by: Václav Muzikář Signed-off-by: Václav Muzikář Co-authored-by: Steven Hawkins --- docs/documentation/release_notes/topics/26_5_0.adoc | 4 ++++ docs/guides/server/db.adoc | 2 +- pom.xml | 2 +- test-framework/db-edb/container/Dockerfile | 9 +++++---- test-framework/db-edb/container/README.md | 11 +++++++++++ 5 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 test-framework/db-edb/container/README.md diff --git a/docs/documentation/release_notes/topics/26_5_0.adoc b/docs/documentation/release_notes/topics/26_5_0.adoc index 75b6dac72a2..5bfcf5a04e7 100644 --- a/docs/documentation/release_notes/topics/26_5_0.adoc +++ b/docs/documentation/release_notes/topics/26_5_0.adoc @@ -95,6 +95,10 @@ As PostgreSQL 13 is end-of-life it is now longer supported. We also updated the docs on how to use a TLS certificate for the JDBC-connection when connecting to a PostgreSQL database. +== EnterpriseDB Advanced 18 support + +EDB 18 is now tested and supported in addition to the existing EDB 17 support. + == Enhanced HTTP performance (preview) You can now enable a more efficient way to handle JSON data in the HTTP layer. diff --git a/docs/guides/server/db.adoc b/docs/guides/server/db.adoc index 25f3e5518dd..59ffe0f747a 100644 --- a/docs/guides/server/db.adoc +++ b/docs/guides/server/db.adoc @@ -23,7 +23,7 @@ The server has built-in support for different databases. You can query the avail |MySQL | `mysql` | ${properties["mysql.version"]} | 8.4 (LTS), 8.0 (LTS) |Oracle Database | `oracle` | ${properties["oracledb.version"]} | 23.x (i.e 23.5+), 19c (19.3+) (*Note:* Oracle RAC is also supported if using the same database engine version, e.g 23.5+, 19.3+) |PostgreSQL | `postgres` | ${properties["postgresql.version"]} | 18.x, 17.x, 16.x, 15.x, 14.x -|EnterpriseDB Advanced | `postgres` | ${properties["edb.version"]} | 17 +|EnterpriseDB Advanced | `postgres` | ${properties["edb.version"]} | 18.x, 17.x |Amazon Aurora PostgreSQL | `postgres` | ${properties["aurora-postgresql.version"]} | 17.x, 16.x, 15.x |Azure SQL Database | `mssql` | latest | latest |Azure SQL Managed Instance | `mssql` | latest | latest diff --git a/pom.xml b/pom.xml index f32093319c4..b0507c07f09 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ 23.6.0.24.10 quay.io/keycloakqe/enterprisedb:${edb.version} - 17 + 18 quay.io/infinispan/server:${infinispan.version} diff --git a/test-framework/db-edb/container/Dockerfile b/test-framework/db-edb/container/Dockerfile index b661e64d4a4..a1ea4bc9039 100644 --- a/test-framework/db-edb/container/Dockerfile +++ b/test-framework/db-edb/container/Dockerfile @@ -1,8 +1,6 @@ FROM registry.access.redhat.com/ubi9 -# Get the token at https://www.enterprisedb.com/repos-downloads -ARG EDB_REPO_TOKEN=token-must-be-set -ENV VERSION=17 +ENV VERSION=18 ENV PGUSER=enterprisedb ENV PGPASSWORD=password ENV PGDATABASE=keycloak @@ -10,7 +8,10 @@ ENV PGPORT=5432 ENV PGDATA=/var/lib/edb/as${VERSION}/data -RUN (curl -1sSLf "https://downloads.enterprisedb.com/${EDB_REPO_TOKEN}/enterprise/setup.rpm.sh" | bash) && \ +# Get the token at https://www.enterprisedb.com/repos-downloads +RUN --mount=type=secret,id=edb_repo_token,required=true \ + export EDB_REPO_TOKEN=$(cat /run/secrets/edb_repo_token) && \ + (curl -1sSLf "https://downloads.enterprisedb.com/${EDB_REPO_TOKEN}/enterprise/setup.rpm.sh" | bash) && \ dnf -y install edb-as${VERSION}-server USER enterprisedb diff --git a/test-framework/db-edb/container/README.md b/test-framework/db-edb/container/README.md new file mode 100644 index 00000000000..4c95ab9c3b4 --- /dev/null +++ b/test-framework/db-edb/container/README.md @@ -0,0 +1,11 @@ +# Create test EDB image + +1. Get EDB repo token from Get the token at https://www.enterprisedb.com/repos-downloads. +2. Build the multi-arch image: +``` +EDB_TOKEN=[your token] podman build --secret id=edb_repo_token,env=EDB_TOKEN --manifest quay.io/keycloakqe/enterprisedb:[version] --platform=linux/arm64,linux/amd64 . +``` +3. Push the multi-arch image: +``` +podman manifest push quay.io/keycloakqe/enterprisedb:[version] +``` \ No newline at end of file