Support icr.io/db2_community/db2 as a compatible image (#7397)

`ibmcom/db2` is deprecated. New image location is `icr.io/db2_community/db2`
testcontainers · Aug 4, 2023 · 9e8b18b · 9e8b18b
1 parent f36f07f
commit 9e8b18b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java
@@ -12,8 +12,11 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
 
     public static final String NAME = "db2";
 
+    @Deprecated
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ibmcom/db2");
 
+    private static final DockerImageName DEFAULT_NEW_IMAGE_NAME = DockerImageName.parse("icr.io/db2_community/db2");
+
     @Deprecated
     public static final String DEFAULT_DB2_IMAGE_NAME = DEFAULT_IMAGE_NAME.getUnversionedPart();
 
@@ -42,7 +45,7 @@ public Db2Container(String dockerImageName) {
 
     public Db2Container(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_NEW_IMAGE_NAME, DEFAULT_IMAGE_NAME);
 
         withPrivilegedMode(true);
         this.waitStrategy =

diff --git a/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java b/modules/db2/src/test/java/org/testcontainers/junit/db2/SimpleDb2Test.java
@@ -25,6 +25,19 @@ public void testSimple() throws SQLException {
         }
     }
 
+    @Test
+    public void testSimpleWithNewImage() throws SQLException {
+        try (Db2Container db2 = new Db2Container("icr.io/db2_community/db2:11.5.8.0").acceptLicense()) {
+            db2.start();
+
+            ResultSet resultSet = performQuery(db2, "SELECT 1 FROM SYSIBM.SYSDUMMY1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            assertHasCorrectExposedAndLivenessCheckPorts(db2);
+        }
+    }
+
     @Test
     public void testWithAdditionalUrlParamInJdbcUrl() {
         try (