From bc151b7c80a4d88074e7a21776fcd3aa843e69fe Mon Sep 17 00:00:00 2001 From: emeroad Date: Fri, 20 Sep 2024 14:56:59 +0900 Subject: [PATCH] [#11506] Update MSSQL docker images --- .../pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java | 2 +- .../src/test/resources/container-license-acceptance.txt | 1 - .../pinpoint/it/plugin/jdbc/jtds/JtdsConnectionIT.java | 2 +- .../com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java | 2 +- .../it/plugin/jdbc/mssql/MSSQLServerContainerFactory.java | 2 +- .../navercorp/pinpoint/it/plugin/jdbc/r2dbc/MssqlServer.java | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 agent-module/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/resources/container-license-acceptance.txt diff --git a/agent-module/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java b/agent-module/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java index 5e20ddca5d3d..b2510e981a50 100644 --- a/agent-module/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/spring/data/r2dbc/R2dbcMssqlTest.java +++ b/agent-module/agent-testweb/spring-data-r2dbc-plugin-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/agent-module/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/resources/container-license-acceptance.txt b/agent-module/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/resources/container-license-acceptance.txt deleted file mode 100644 index ce512af365ae..000000000000 --- a/agent-module/agent-testweb/spring-data-r2dbc-plugin-testweb/src/test/resources/container-license-acceptance.txt +++ /dev/null @@ -1 +0,0 @@ -mcr.microsoft.com/mssql/server:2017-CU12 \ No newline at end of file diff --git a/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/JtdsConnectionIT.java b/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/JtdsConnectionIT.java index 409d4eec4c98..bda9bccda250 100644 --- a/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/JtdsConnectionIT.java +++ b/agent-module/plugins-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/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java b/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java index e01938d0dc1f..51b5b224c864 100644 --- a/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java +++ b/agent-module/plugins-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/agent-module/plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/mssql/MSSQLServerContainerFactory.java b/agent-module/plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/mssql/MSSQLServerContainerFactory.java index c3c45db19b6e..85cae27213c8 100644 --- a/agent-module/plugins-it/mssql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/mssql/MSSQLServerContainerFactory.java +++ b/agent-module/plugins-it/mssql-jdbc-it/src/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/agent-module/plugins-it/spring-data-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/MssqlServer.java b/agent-module/plugins-it/spring-data-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/MssqlServer.java index aa2585966f64..61484f7243fb 100644 --- a/agent-module/plugins-it/spring-data-r2dbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/r2dbc/MssqlServer.java +++ b/agent-module/plugins-it/spring-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();