From 0a8c42e00b5205ba64c197f8a069103154fec9ba Mon Sep 17 00:00:00 2001 From: livk Date: Wed, 16 Apr 2025 12:00:30 +0800 Subject: [PATCH 1/3] fix: The issue that MySQL 9.3 fails to start due to the removal of system variables is fixed --- modules/mysql/src/main/resources/mysql-default-conf/my.cnf | 1 - .../mysql/src/test/java/org/testcontainers/MySQLTestImages.java | 2 ++ .../org/testcontainers/containers/MySQLRootAccountTest.java | 1 + .../org/testcontainers/junit/mysql/MultiVersionMySQLTest.java | 1 + .../src/test/resources/somepath/mysql_conf_override/my.cnf | 1 - 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/mysql/src/main/resources/mysql-default-conf/my.cnf b/modules/mysql/src/main/resources/mysql-default-conf/my.cnf index 6fc2129357f..b22aa7d9e93 100644 --- a/modules/mysql/src/main/resources/mysql-default-conf/my.cnf +++ b/modules/mysql/src/main/resources/mysql-default-conf/my.cnf @@ -43,7 +43,6 @@ innodb_data_file_path = ibdata1:10M:autoextend innodb_buffer_pool_size = 16M #innodb_additional_mem_pool_size = 2M # Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 5M innodb_log_buffer_size = 8M innodb_flush_log_at_trx_commit = 1 innodb_lock_wait_timeout = 50 diff --git a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java index 2254754f2c2..6b3fe80ce4a 100644 --- a/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java +++ b/modules/mysql/src/test/java/org/testcontainers/MySQLTestImages.java @@ -9,4 +9,6 @@ public class MySQLTestImages { public static final DockerImageName MYSQL_80_IMAGE = DockerImageName.parse("mysql:8.0.36"); public static final DockerImageName MYSQL_INNOVATION_IMAGE = DockerImageName.parse("mysql:8.3.0"); + + public static final DockerImageName MYSQL_93_IMAGE = DockerImageName.parse("mysql:9.3.0"); } diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java index 51ba5257fa3..2fc49985d29 100644 --- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java @@ -22,6 +22,7 @@ public static DockerImageName[] params() { MySQLTestImages.MYSQL_57_IMAGE, MySQLTestImages.MYSQL_80_IMAGE, MySQLTestImages.MYSQL_INNOVATION_IMAGE, + MySQLTestImages.MYSQL_93_IMAGE }; } diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java index 4c8516cc5cc..d49dc8e5419 100644 --- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java @@ -22,6 +22,7 @@ public static DockerImageName[] params() { MySQLTestImages.MYSQL_57_IMAGE, MySQLTestImages.MYSQL_80_IMAGE, MySQLTestImages.MYSQL_INNOVATION_IMAGE, + MySQLTestImages.MYSQL_93_IMAGE }; } diff --git a/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf b/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf index 5721bf52ccb..6e6dcd28ad1 100644 --- a/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf +++ b/modules/mysql/src/test/resources/somepath/mysql_conf_override/my.cnf @@ -46,7 +46,6 @@ innodb_data_file_path = ibdata1:10M:autoextend innodb_buffer_pool_size = 16M #innodb_additional_mem_pool_size = 2M # Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 5M innodb_log_buffer_size = 8M innodb_flush_log_at_trx_commit = 1 innodb_lock_wait_timeout = 50 From 0cfe1f7eafbedf50b603eb381777840f17fe5089 Mon Sep 17 00:00:00 2001 From: julianladisch Date: Fri, 18 Jul 2025 07:08:41 +0200 Subject: [PATCH 2/3] examples/sftp: Upgrade jsch from jcraft 0.1.55 to mwiede 2.27.0' (#10275) Upgrade testImplementation dependency from `com.jcraft:jsch:0.1.55` to `com.github.mwiede:jsch:2.27.0` --- examples/sftp/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/sftp/build.gradle b/examples/sftp/build.gradle index fbb5f6cbe40..53515e58b0a 100644 --- a/examples/sftp/build.gradle +++ b/examples/sftp/build.gradle @@ -7,7 +7,7 @@ repositories { } dependencies { - testImplementation 'com.jcraft:jsch:0.1.55' + testImplementation 'com.github.mwiede:jsch:2.27.0' testImplementation 'org.testcontainers:testcontainers' testImplementation 'org.assertj:assertj-core:3.26.3' testImplementation 'ch.qos.logback:logback-classic:1.3.14' From 9a0e60241feac16922bdeb5d406766175b8a4327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 11 Aug 2025 09:46:46 -0600 Subject: [PATCH 3/3] Fix format --- .../org/testcontainers/containers/MySQLRootAccountTest.java | 2 +- .../org/testcontainers/junit/mysql/MultiVersionMySQLTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java index 2fc49985d29..e9a3c862143 100644 --- a/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/containers/MySQLRootAccountTest.java @@ -22,7 +22,7 @@ public static DockerImageName[] params() { MySQLTestImages.MYSQL_57_IMAGE, MySQLTestImages.MYSQL_80_IMAGE, MySQLTestImages.MYSQL_INNOVATION_IMAGE, - MySQLTestImages.MYSQL_93_IMAGE + MySQLTestImages.MYSQL_93_IMAGE, }; } diff --git a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java index d49dc8e5419..25085289ba7 100644 --- a/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java +++ b/modules/mysql/src/test/java/org/testcontainers/junit/mysql/MultiVersionMySQLTest.java @@ -22,7 +22,7 @@ public static DockerImageName[] params() { MySQLTestImages.MYSQL_57_IMAGE, MySQLTestImages.MYSQL_80_IMAGE, MySQLTestImages.MYSQL_INNOVATION_IMAGE, - MySQLTestImages.MYSQL_93_IMAGE + MySQLTestImages.MYSQL_93_IMAGE, }; }