From ae8f1cd4a3895d552eeb19cee5c75c0f55399512 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 13 Jun 2022 14:18:11 +1200
Subject: [PATCH] #86 - Change OracleContainer to use by default
 gvenzl/oracle-xe rather than vitorfec/oracle-xe-18c

---
 .../io/ebean/test/containers/BaseContainer.java    |  1 +
 .../io/ebean/test/containers/OracleContainer.java  | 14 ++++++++------
 .../ebean/test/containers/OracleContainerTest.java |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/ebean/test/containers/BaseContainer.java b/src/main/java/io/ebean/test/containers/BaseContainer.java
index 8238824..a9c7382 100644
--- a/src/main/java/io/ebean/test/containers/BaseContainer.java
+++ b/src/main/java/io/ebean/test/containers/BaseContainer.java
@@ -304,6 +304,7 @@ boolean notEmpty(String value) {
   }
 
   boolean hasContainerName() {
+    config.setDefaultContainerName();
     return notEmpty(config.containerName());
   }
 
diff --git a/src/main/java/io/ebean/test/containers/OracleContainer.java b/src/main/java/io/ebean/test/containers/OracleContainer.java
index 57bc406..cb4a02a 100644
--- a/src/main/java/io/ebean/test/containers/OracleContainer.java
+++ b/src/main/java/io/ebean/test/containers/OracleContainer.java
@@ -26,7 +26,7 @@ public static Builder newBuilder(String version) {
 
   public static class Builder extends DbConfig<OracleContainer, OracleContainer.Builder> {
 
-    private String apexPort = "8181";
+    private String apexPort;
     private String internalApexPort = "8080";
     /**
      * Wait time allowed when starting oracle from scratch.
@@ -35,10 +35,10 @@ public static class Builder extends DbConfig<OracleContainer, OracleContainer.Bu
 
     private Builder(String version) {
       super("oracle", 1521, 1521, version);
-      this.image = "vitorfec/oracle-xe-18c:" + version;
+      this.image = "gvenzl/oracle-xe:" + version;
       this.adminUsername = "system";
       this.adminPassword = "oracle";
-      this.dbName = "XE";
+      this.dbName = "XE";//XEPDB1
       this.username = "test_user";
     }
 
@@ -162,10 +162,12 @@ private boolean userExists(Connection connection) {
   @Override
   protected ProcessBuilder runProcess() {
     List<String> args = dockerRun();
-    args.add("-p");
-    args.add(apexPort + ":" + internalApexPort);
+    if (apexPort != null && !apexPort.isEmpty()) {
+      args.add("-p");
+      args.add(apexPort + ":" + internalApexPort);
+    }
     args.add("-e");
-    args.add("ORACLE_PWD=" + dbConfig.getAdminPassword());
+    args.add("ORACLE_PASSWORD=" + dbConfig.getAdminPassword());
     args.add(config.getImage());
     return createProcessBuilder(args);
   }
diff --git a/src/test/java/io/ebean/test/containers/OracleContainerTest.java b/src/test/java/io/ebean/test/containers/OracleContainerTest.java
index c3b5830..82f0f9b 100644
--- a/src/test/java/io/ebean/test/containers/OracleContainerTest.java
+++ b/src/test/java/io/ebean/test/containers/OracleContainerTest.java
@@ -13,7 +13,7 @@ class OracleContainerTest {
   @Disabled
   @Test
   void start() {
-    OracleContainer container = OracleContainer.builder("latest")
+    OracleContainer container = OracleContainer.builder("21.3.0-slim")
       //.user("test_ebean")
       .build();
 
@@ -42,7 +42,7 @@ void start() {
   @Test
   void viaContainerFactory() {
     Properties properties = new Properties();
-    properties.setProperty("oracle.version", "latest");
+    properties.setProperty("oracle.version", "21.3.0-slim");
     //properties.setProperty("oracle.containerName", "junk_oracle");
     //properties.setProperty("oracle.port", "1521");
     //properties.setProperty("oracle.dbName", "test_rob");