[SPARK-46525][DOCKER][TESTS][FOLLOWUP] Fix docker-integration-tests o…

…n Apple Sillicon for db2 and oracle with colima docker environment
apache · Jan 9, 2024 · 440b4df · 440b4df
1 parent 70b90c8
commit 440b4df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...tegration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala b/...tegration-tests/src/test/scala/org/apache/spark/sql/jdbc/DockerJDBCIntegrationSuite.scala
@@ -156,7 +156,7 @@ abstract class DockerJDBCIntegrationSuite
         .newHostConfig()
         .withNetworkMode("bridge")
         .withPrivileged(db.privileged)
-        .withPortBindings(PortBinding.parse(s"$dockerIp:$externalPort:${db.jdbcPort}"))
+        .withPortBindings(PortBinding.parse(s"$externalPort:${db.jdbcPort}"))
 
       if (db.usesIpc) {
         hostConfig.withIpcMode("host")
@@ -197,6 +197,7 @@ abstract class DockerJDBCIntegrationSuite
       }
     } catch {
       case NonFatal(e) =>
+        logError(s"Failed to initialize Docker container for ${this.getClass.getName}", e)
         try {
           afterAll()
         } finally {

diff --git a/...r-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleDatabaseOnDocker.scala b/...r-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleDatabaseOnDocker.scala
@@ -57,7 +57,7 @@ class OracleDatabaseOnDocker extends DatabaseOnDocker with Logging {
       val newBind = new Bind(
         dir.getAbsolutePath,
         new Volume("/docker-entrypoint-initdb.d"),
-        AccessMode.ro)
+        AccessMode.DEFAULT)
       hostConfigBuilder.withBinds(hostConfigBuilder.getBinds :+ newBind: _*)
     } catch {
       case e: Exception =>