Fix build (testcontainers#8801)

* Update Testcontainers non-compatible images * Disable Jib tests * Disable Dynalite tests * Update Nginx non-compatible images * Fix chromadb test by updating chromadb version to 0.4.23 * Remove non-compatible selenium image * Fix example tests
lizhou1111 · Jul 13, 2024 · f09d0d2 · f09d0d2
1 parent b6342d9
commit f09d0d2
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/core/src/test/java/org/testcontainers/containers/JibTest.java b/core/src/test/java/org/testcontainers/containers/JibTest.java
@@ -1,6 +1,7 @@
 package org.testcontainers.containers;
 
 import com.github.dockerjava.api.command.InspectImageResponse;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.output.OutputFrame.OutputType;
@@ -12,6 +13,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Ignore("Jib doesn't work with latest Docker version provided by GH Actions. Jib should be updated")
 public class JibTest {
 
     @Test

diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java
@@ -19,9 +19,9 @@ public static String[] parameters() {
             "alpine:3.17",
             "alpine", // omitting the tag should work and default to latest
             "alpine@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d",
-            "quay.io/testcontainers/ryuk:latest",
-            "quay.io/testcontainers/ryuk:0.2.3",
-            "quay.io/testcontainers/ryuk@sha256:bb5a635cac4bd96c93cc476969ce11dc56436238ec7cd028d0524462f4739dd9",
+            "docker.io/testcontainers/ryuk:latest",
+            "docker.io/testcontainers/ryuk:0.7.0",
+            "docker.io/testcontainers/ryuk@sha256:bcbee39cd601396958ba1bd06ea14ad64ce0ea709de29a427d741d1f5262080a",
             //            "ibmcom/db2express-c", // Big image for testing with slow networks
         };
     }

diff --git a/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java b/docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java
@@ -13,7 +13,9 @@ public class DependsOnTest {
     public GenericContainer<?> redis = new GenericContainer<>("redis:6-alpine").withExposedPorts(6379);
 
     @Rule
-    public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.9.4").dependsOn(redis).withExposedPorts(80);
+    public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.27.0-alpine3.19-slim")
+        .dependsOn(redis)
+        .withExposedPorts(80);
 
     // }
 

diff --git a/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java b/docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java
@@ -14,14 +14,16 @@ public class WaitStrategiesTest {
 
     @Rule
     // waitForNetworkListening {
-    public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.9.4")) //
+    public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.27.0-alpine3.19-slim")) //
         .withExposedPorts(80);
 
     // }
 
     @Rule
     // waitForSimpleHttp {
-    public GenericContainer nginxWithHttpWait = new GenericContainer(DockerImageName.parse("nginx:1.9.4"))
+    public GenericContainer nginxWithHttpWait = new GenericContainer(
+        DockerImageName.parse("nginx:1.27.0-alpine3.19-slim")
+    )
         .withExposedPorts(80)
         .waitingFor(Wait.forHttp("/"));
 

diff --git a/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java b/modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java
@@ -10,7 +10,7 @@ public class ChromaDBContainerTest {
     @Test
     public void test() {
         try ( // container {
-            ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.22")
+            ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.23")
             // }
         ) {
             chroma.start();

diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java
@@ -9,12 +9,14 @@
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;
 import com.amazonaws.services.dynamodbv2.model.TableDescription;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Ignore("Image is not compatible with the latest Docker version provided by GH Actions")
 public class DynaliteContainerTest {
 
     private static final DockerImageName DYNALITE_IMAGE = DockerImageName.parse(

diff --git a/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java b/modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java
@@ -22,7 +22,7 @@
 
 public class SimpleNginxTest {
 
-    private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.9.4");
+    private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.27.0-alpine3.19-slim");
 
     private static String tmpDirectory = System.getProperty("user.home") + "/.tmp-test-container";
 

diff --git a/modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java b/modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java
@@ -15,7 +15,7 @@ public class SeleniumStartTest {
 
     @Parameterized.Parameters(name = "tag: {0}")
     public static String[] data() {
-        return new String[] { "4.0.0", "3.4.0", "2.53.0", "2.45.0" };
+        return new String[] { "4.0.0", "3.4.0", "2.53.0" };
     }
 
     @Parameterized.Parameter