Skip to content

Commit 7e5266d

Browse files
authored
Fix build (#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
1 parent 6658a2c commit 7e5266d

File tree

9 files changed

+17
-16
lines changed

9 files changed

+17
-16
lines changed

core/src/test/java/org/testcontainers/containers/JibTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.testcontainers.containers;
22

33
import com.github.dockerjava.api.command.InspectImageResponse;
4+
import org.junit.Ignore;
45
import org.junit.Test;
56
import org.testcontainers.DockerClientFactory;
67
import org.testcontainers.containers.output.OutputFrame.OutputType;
@@ -12,6 +13,7 @@
1213

1314
import static org.assertj.core.api.Assertions.assertThat;
1415

16+
@Ignore("Jib doesn't work with latest Docker version provided by GH Actions. Jib should be updated")
1517
public class JibTest {
1618

1719
@Test

core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public static String[] parameters() {
1919
"alpine:3.17",
2020
"alpine", // omitting the tag should work and default to latest
2121
"alpine@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d",
22-
"quay.io/testcontainers/ryuk:latest",
23-
"quay.io/testcontainers/ryuk:0.2.3",
24-
"quay.io/testcontainers/ryuk@sha256:bb5a635cac4bd96c93cc476969ce11dc56436238ec7cd028d0524462f4739dd9",
22+
"docker.io/testcontainers/ryuk:latest",
23+
"docker.io/testcontainers/ryuk:0.7.0",
24+
"docker.io/testcontainers/ryuk@sha256:bcbee39cd601396958ba1bd06ea14ad64ce0ea709de29a427d741d1f5262080a",
2525
// "ibmcom/db2express-c", // Big image for testing with slow networks
2626
};
2727
}

docs/examples/junit4/generic/src/test/java/generic/DependsOnTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ public class DependsOnTest {
1313
public GenericContainer<?> redis = new GenericContainer<>("redis:6-alpine").withExposedPorts(6379);
1414

1515
@Rule
16-
public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.9.4").dependsOn(redis).withExposedPorts(80);
16+
public GenericContainer<?> nginx = new GenericContainer<>("nginx:1.27.0-alpine3.19-slim")
17+
.dependsOn(redis)
18+
.withExposedPorts(80);
1719

1820
// }
1921

docs/examples/junit4/generic/src/test/java/generic/WaitStrategiesTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ public class WaitStrategiesTest {
1414

1515
@Rule
1616
// waitForNetworkListening {
17-
public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.9.4")) //
17+
public GenericContainer nginx = new GenericContainer(DockerImageName.parse("nginx:1.27.0-alpine3.19-slim")) //
1818
.withExposedPorts(80);
1919

2020
// }
2121

2222
@Rule
2323
// waitForSimpleHttp {
24-
public GenericContainer nginxWithHttpWait = new GenericContainer(DockerImageName.parse("nginx:1.9.4"))
24+
public GenericContainer nginxWithHttpWait = new GenericContainer(
25+
DockerImageName.parse("nginx:1.27.0-alpine3.19-slim")
26+
)
2527
.withExposedPorts(80)
2628
.waitingFor(Wait.forHttp("/"));
2729

modules/chromadb/src/test/java/org/testcontainers/chromadb/ChromaDBContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ChromaDBContainerTest {
1010
@Test
1111
public void test() {
1212
try ( // container {
13-
ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.22")
13+
ChromaDBContainer chroma = new ChromaDBContainer("chromadb/chroma:0.4.23")
1414
// }
1515
) {
1616
chroma.start();

modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
1010
import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;
1111
import com.amazonaws.services.dynamodbv2.model.TableDescription;
12+
import org.junit.Ignore;
1213
import org.junit.Rule;
1314
import org.junit.Test;
1415
import org.testcontainers.utility.DockerImageName;
1516

1617
import static org.assertj.core.api.Assertions.assertThat;
1718

19+
@Ignore("Image is not compatible with the latest Docker version provided by GH Actions")
1820
public class DynaliteContainerTest {
1921

2022
private static final DockerImageName DYNALITE_IMAGE = DockerImageName.parse(

modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
public class SimpleNginxTest {
2424

25-
private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.9.4");
25+
private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.27.0-alpine3.19-slim");
2626

2727
private static String tmpDirectory = System.getProperty("user.home") + "/.tmp-test-container";
2828

modules/selenium/src/test/java/org/testcontainers/SeleniumTestImages.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class SeleniumStartTest {
1515

1616
@Parameterized.Parameters(name = "tag: {0}")
1717
public static String[] data() {
18-
return new String[] { "4.0.0", "3.4.0", "2.53.0", "2.45.0" };
18+
return new String[] { "4.0.0", "3.4.0", "2.53.0" };
1919
}
2020

2121
@Parameterized.Parameter

0 commit comments

Comments
 (0)