From c94009626723767c6336aecb9082743f4736d312 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:31:30 +0000 Subject: [PATCH 1/4] chore(deps): update gvenzl/oracle-free docker tag to v23.5 --- docker-compose.yml | 2 +- legacydb/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e179a4a4b..42ad26d98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: APP_USER: THE ORACLE_RANDOM_PASSWORD: yes platform: "linux/amd64" - image: gvenzl/oracle-free:23.3-slim-faststart + image: gvenzl/oracle-free:23.5-slim-faststart ports: [1521:1521] volumes: [/opt/oracle/oradata] healthcheck: diff --git a/legacydb/Dockerfile b/legacydb/Dockerfile index 6859818fb..5dba85efe 100644 --- a/legacydb/Dockerfile +++ b/legacydb/Dockerfile @@ -1,4 +1,4 @@ -FROM gvenzl/oracle-free:23.3-slim-faststart +FROM gvenzl/oracle-free:23.5-slim-faststart COPY --chown=oracle:oracle removeDatabase ${ORACLE_BASE}/removeDatabase RUN chmod +x ${ORACLE_BASE}/removeDatabase From 06572e6ed9d21b1d13676e4e5f208f92843211e8 Mon Sep 17 00:00:00 2001 From: Paulo Gomes da Cruz Junior Date: Fri, 30 Aug 2024 08:40:49 -0700 Subject: [PATCH 2/4] chore: force rebuild --- legacy/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/legacy/Dockerfile b/legacy/Dockerfile index 916fbf0f4..62009b82f 100644 --- a/legacy/Dockerfile +++ b/legacy/Dockerfile @@ -30,7 +30,6 @@ RUN mvn versions:set -DnewVersion=${APP_VERSION} -f pom.xml -DskipTests -Dtests. # Build RUN mvn -Pnative native:compile - ### Deployer FROM gcr.io/distroless/java-base:nonroot AS deploy ARG PORT=9000 From 829d47e126728bbae21747c7b9a9820106a6ee7c Mon Sep 17 00:00:00 2001 From: Paulo Gomes da Cruz Junior Date: Fri, 30 Aug 2024 09:00:02 -0700 Subject: [PATCH 3/4] chore(deps): updating legacy custom oracle --- .../java/ca/bc/gov/app/extensions/CustomOracleContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java b/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java index d6bba5978..d85729590 100644 --- a/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java +++ b/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java @@ -7,7 +7,7 @@ public class CustomOracleContainer extends OracleContainer { public CustomOracleContainer() { - super("gvenzl/oracle-xe:21.3.0-slim-faststart"); + super("gvenzl/oracle-free:23.5-slim-faststart"); this.withDatabaseName("legacyfsa") .withUsername("THE") From 0485b106cdc3ff819ee1568fd3b3efda2d26a7db Mon Sep 17 00:00:00 2001 From: Paulo Gomes da Cruz Junior Date: Tue, 3 Sep 2024 14:59:37 -0700 Subject: [PATCH 4/4] chore: updating configurations --- .../ca/bc/gov/app/extensions/CustomOracleContainer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java b/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java index d85729590..aad29acf8 100644 --- a/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java +++ b/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java @@ -3,11 +3,16 @@ import java.time.Duration; import java.util.UUID; import org.testcontainers.containers.OracleContainer; +import org.testcontainers.utility.DockerImageName; public class CustomOracleContainer extends OracleContainer { public CustomOracleContainer() { - super("gvenzl/oracle-free:23.5-slim-faststart"); + super( + DockerImageName + .parse("gvenzl/oracle-free:23.5-slim-faststart") + .asCompatibleSubstituteFor("gvenzl/oracle-xe") + ); this.withDatabaseName("legacyfsa") .withUsername("THE")