update OceanBaseCEContainer for new image

Author: whhe

docs/modules/databases/jdbc.md

@@ -57,7 +57,7 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 #### Using OceanBase
 
-`jdbc:tc:oceanbasece:4.2.2:///databasename`
+`jdbc:tc:oceanbasece:4.2.1-lts:///databasename`
 
 #### Using Oracle
 

modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainer.java

@@ -1,6 +1,7 @@
 package org.testcontainers.oceanbase;
 
 import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -26,14 +27,54 @@ public class OceanBaseCEContainer extends JdbcDatabaseContainer<OceanBaseCEConta
 
     private static final Integer RPC_PORT = 2882;
 
-    private static final String DEFAULT_TEST_TENANT_NAME = "test";
+    private static final String DEFAULT_USER_TENANT_NAME = "test";
 
-    private static final String DEFAULT_USERNAME = "root";
+    private static final String DEFAULT_USER = "root";
 
     private static final String DEFAULT_PASSWORD = "";
 
     private static final String DEFAULT_DATABASE_NAME = "test";
 
+    public enum Mode {
+        /**
+         * Use as much hardware resources as possible for deployment by default,
+         * and all environment variables are available.
+         */
+        NORMAL,
+        /**
+         * Use the minimum hardware resources for deployment by default,
+         * and all environment variables are available.
+         */
+        MINI,
+        /**
+         * Use minimal hardware resources and pre-built deployment files for quick startup,
+         * and password of user tenant is the only available environment variable.
+         */
+        SLIM;
+
+        public static Mode fromString(String mode) {
+            if (mode == null) {
+                throw new IllegalArgumentException("Mode cannot be null");
+            }
+            switch (mode.toUpperCase()) {
+                case "NORMAL":
+                    return NORMAL;
+                case "MINI":
+                    return MINI;
+                case "SLIM":
+                    return SLIM;
+                default:
+                    throw new IllegalArgumentException("Unknown mode: " + mode);
+            }
+        }
+    }
+
+    private Mode mode = Mode.SLIM;
+
+    private String tenantName = DEFAULT_USER_TENANT_NAME;
+
+    private String password = DEFAULT_PASSWORD;
+
     public OceanBaseCEContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
@@ -43,6 +84,28 @@ public OceanBaseCEContainer(DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPorts(SQL_PORT, RPC_PORT);
+        setWaitStrategy(Wait.forLogMessage(".*boot success!.*", 1));
+    }
+
+    @Override
+    protected void configure() {
+        addEnv("MODE", mode.name().toLowerCase());
+
+        if (!DEFAULT_USER_TENANT_NAME.equals(tenantName)) {
+            if (mode == Mode.SLIM) {
+                throw new IllegalArgumentException("Tenant name is not configurable on slim mode");
+            }
+            addEnv("OB_TENANT_NAME", tenantName);
+        }
+
+        if (!DEFAULT_PASSWORD.equals(password)) {
+            addEnv("OB_TENANT_PASSWORD", password);
+        }
+    }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
     }
 
     @Override
@@ -64,19 +127,31 @@ public String getDatabaseName() {
 
     @Override
     public String getUsername() {
-        // In OceanBase, the jdbc username is related to the name of user, tenant and cluster,
-        // if a tenant name other than the default value 'test' is used, you should manually
-        // construct the jdbc username by yourself.
-        return DEFAULT_USERNAME + "@" + DEFAULT_TEST_TENANT_NAME;
+        return DEFAULT_USER + "@" + tenantName;
     }
 
     @Override
     public String getPassword() {
-        return DEFAULT_PASSWORD;
+        return password;
     }
 
     @Override
     protected String getTestQueryString() {
         return "SELECT 1";
     }
+
+    public OceanBaseCEContainer withMode(String mode) {
+        this.mode = Mode.fromString(mode);
+        return this;
+    }
+
+    public OceanBaseCEContainer withTenantName(String tenantName) {
+        this.tenantName = tenantName;
+        return this;
+    }
+
+    public OceanBaseCEContainer withPassword(String password) {
+        this.password = password;
+        return this;
+    }
 }

modules/oceanbase/src/main/java/org/testcontainers/oceanbase/OceanBaseCEContainerProvider.java

@@ -9,7 +9,7 @@
  */
 public class OceanBaseCEContainerProvider extends JdbcDatabaseContainerProvider {
 
-    private static final String DEFAULT_TAG = "4.2.2";
+    private static final String DEFAULT_TAG = "4.2.1-lts";
 
     @Override
     public boolean supports(String databaseType) {

modules/oceanbase/src/test/java/org/testcontainers/oceanbase/SimpleOceanBaseCETest.java

@@ -19,9 +19,7 @@ public class SimpleOceanBaseCETest extends AbstractContainerDatabaseTest {
 
     @SuppressWarnings("resource")
     private OceanBaseCEContainer testContainer() {
-        return ((OceanBaseCEContainer) containerProvider.newInstance()).withEnv("MODE", "slim")
-            .withEnv("FASTBOOT", "true")
-            .withLogConsumer(new Slf4jLogConsumer(logger));
+        return ((OceanBaseCEContainer) containerProvider.newInstance()).withLogConsumer(new Slf4jLogConsumer(logger));
     }
 
     @Test