upgrade testcontainers for Apple Silicon

Author: vincentlauvlwj

ktorm-support-mysql/ktorm-support-mysql.gradle.kts

@@ -10,6 +10,6 @@ dependencies {
     api(project(":ktorm-core"))
     testImplementation(project(":ktorm-core", configuration = "testOutput"))
     testImplementation(project(":ktorm-jackson"))
-    testImplementation("org.testcontainers:mysql:1.15.1")
+    testImplementation("org.testcontainers:mysql:1.19.7")
     testImplementation("mysql:mysql-connector-java:8.0.23")
 }

ktorm-support-oracle/ktorm-support-oracle.gradle.kts

@@ -9,6 +9,6 @@ plugins {
 dependencies {
     api(project(":ktorm-core"))
     testImplementation(project(":ktorm-core", configuration = "testOutput"))
-    testImplementation("org.testcontainers:oracle-xe:1.15.1")
+    testImplementation("org.testcontainers:oracle-xe:1.19.7")
     testImplementation(files("lib/ojdbc6-11.2.0.3.jar"))
 }

ktorm-support-oracle/src/test/kotlin/org/ktorm/support/oracle/BaseOracleTest.kt

@@ -1,33 +1,47 @@
 package org.ktorm.support.oracle
 
-import org.junit.ClassRule
 import org.ktorm.BaseTest
 import org.ktorm.database.Database
 import org.testcontainers.containers.OracleContainer
+import kotlin.concurrent.thread
 
 abstract class BaseOracleTest : BaseTest() {
 
     override fun init() {
-        database = Database.connect(
-            url = container.jdbcUrl,
-            driver = container.driverClassName,
-            user = container.username,
-            password = container.password,
-            alwaysQuoteIdentifiers = true
-        )
-
+        database = Database.connect(jdbcUrl, driverClassName, username, password, alwaysQuoteIdentifiers = true)
         execSqlScript("init-oracle-data.sql")
     }
 
     override fun destroy() {
         execSqlScript("drop-oracle-data.sql")
     }
 
-    companion object {
-        @JvmField
-        @ClassRule
-        val container = OracleContainer("zerda/oracle-database:11.2.0.2-xe")
-            // At least 1 GB memory is required by Oracle.
-            .withCreateContainerCmdModifier { cmd -> cmd.hostConfig?.withShmSize((1 * 1024 * 1024 * 1024).toLong()) }
+    /**
+     * Unfortunately Oracle databases aren’t compatible with the new Apple Silicon CPU architecture,
+     * so if you are using a brand-new MacBook, you need to install colima.
+     *
+     * 1. Installation: https://github.com/abiosoft/colima#installation
+     * 2. Run Colima with the command: `colima start --arch x86_64 --cpu 2 --memory 4 --disk 16 --network-address`
+     * 3. Set env vars like below:
+     *
+     * ```sh
+     * export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
+     * export TESTCONTAINERS_HOST_OVERRIDE=$(colima ls -j | jq -r '.address')
+     * export DOCKER_HOST="unix://${HOME}/.colima/default/docker.sock"
+     * ```
+     *
+     * See https://java.testcontainers.org/supported_docker_environment/#colima
+     */
+    companion object : OracleContainer("gvenzl/oracle-xe:11.2.0.2") {
+        init {
+            // Configure the container.
+            usingSid()
+            withCreateContainerCmdModifier { cmd -> cmd.hostConfig?.withShmSize((1 * 1024 * 1024 * 1024).toLong()) }
+
+            // Start the container when it's first used.
+            start()
+            // Stop the container when the process exits.
+            Runtime.getRuntime().addShutdownHook(thread(start = false) { stop() })
+        }
     }
 }

ktorm-support-oracle/src/test/kotlin/org/ktorm/support/oracle/CommonTest.kt

@@ -106,7 +106,7 @@ class CommonTest : BaseOracleTest() {
 
     @Test
     fun testSchema() {
-        val t = object : Table<Department>("t_department", schema = container.username.uppercase()) {
+        val t = object : Table<Department>("t_department", schema = username.uppercase()) {
             val id = int("id").primaryKey().bindTo { it.id }
             val name = varchar("name").bindTo { it.name }
         }

ktorm-support-postgresql/ktorm-support-postgresql.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     api(project(":ktorm-core"))
     testImplementation(project(":ktorm-core", configuration = "testOutput"))
     testImplementation(project(":ktorm-jackson"))
-    testImplementation("org.testcontainers:postgresql:1.15.1")
+    testImplementation("org.testcontainers:postgresql:1.19.7")
     testImplementation("org.postgresql:postgresql:42.2.5")
     testImplementation("com.zaxxer:HikariCP:4.0.3")
     testImplementation("com.mchange:c3p0:0.9.5.5")

ktorm-support-sqlserver/ktorm-support-sqlserver.gradle.kts

@@ -9,6 +9,6 @@ plugins {
 dependencies {
     api(project(":ktorm-core"))
     testImplementation(project(":ktorm-core", configuration = "testOutput"))
-    testImplementation("org.testcontainers:mssqlserver:1.15.1")
+    testImplementation("org.testcontainers:mssqlserver:1.19.7")
     testImplementation("com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8")
 }