[pinpoint-apm#11506] Update MSSQL docker images

emeroad · Sep 20, 2024 · bc151b7 · bc151b7
1 parent ff3c046
commit bc151b7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/...ugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java b/...ugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java
@@ -31,7 +31,7 @@ public static void beforeClass() {
         Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
         Assumptions.assumeFalse(DockerTestUtils.isArmDockerServer(), "ARM not supported");
 
-        container = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2017-CU12");
+        container = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04");
         container.acceptLicense();
         container.withInitScript("mssql-init.sql");
         container.start();

diff --git a/...tweb/spring-data-r2dbc-plugin-testweb/src/test/resources/container-license-acceptance.txt b/...tweb/spring-data-r2dbc-plugin-testweb/src/test/resources/container-license-acceptance.txt
diff --git a/...it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/JtdsConnectionIT.java b/...it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/JtdsConnectionIT.java
@@ -66,7 +66,7 @@ public class JtdsConnectionIT {
     public static final JdbcDatabaseContainer<?> mssqlserver = newMSSQLServerContainer(logger.getName());
 
     public static JdbcDatabaseContainer<?> newMSSQLServerContainer(String loggerName) {
-        final MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2019-latest");
+        final MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04");
         mssqlServerContainer.acceptLicense();
         mssqlServerContainer.withInitScript("sql/init_mssql.sql");
         mssqlServerContainer.withPassword(JtdsITConstants.PASSWORD);

diff --git a/...gins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java b/...gins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java
@@ -19,7 +19,7 @@ public class MsSqlServer implements SharedTestLifeCycle {
     public Properties beforeAll() {
         Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
 
-        mssqlserver = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2019-latest");
+        mssqlserver = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04");
         mssqlserver.acceptLicense();
         mssqlserver.withInitScript("sql/init_mssql.sql");
         mssqlserver.withPassword(JtdsITConstants.PASSWORD);

diff --git a/...rc/test/java/com/navercorp/pinpoint/it/plugin/jdbc/mssql/MSSQLServerContainerFactory.java b/...rc/test/java/com/navercorp/pinpoint/it/plugin/jdbc/mssql/MSSQLServerContainerFactory.java
@@ -29,7 +29,7 @@ private MSSQLServerContainerFactory() {
     }
 
     public static MSSQLServerContainer<?> newMSSQLServerContainer(String loggerName) {
-        final MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2017-CU12");
+        final MSSQLServerContainer<?> mssqlServerContainer = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04");
         mssqlServerContainer.acceptLicense();
         mssqlServerContainer.withInitScript("sql/init_mssql.sql");
 

diff --git a/...-data-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/MssqlServer.java b/...-data-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/MssqlServer.java
@@ -36,7 +36,7 @@ public class MssqlServer implements SharedTestLifeCycle {
     public Properties beforeAll() {
         Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
 
-        container = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2017-CU12");
+        container = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04");
         container.waitingFor(Wait.forListeningPort());
         container.withInitScript("mssql-init.sql");
         container.start();