diff --git a/tests/src/org.testcontainers/testcontainers/1.19.8/required-docker-images.txt b/tests/src/org.testcontainers/testcontainers/1.19.8/required-docker-images.txt index fe5a7cd60..eb2a750fd 100644 --- a/tests/src/org.testcontainers/testcontainers/1.19.8/required-docker-images.txt +++ b/tests/src/org.testcontainers/testcontainers/1.19.8/required-docker-images.txt @@ -1 +1,2 @@ nginx:1-alpine-slim +testcontainers/ryuk:0.10.1 diff --git a/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/java/org_testcontainers/testcontainers/TestcontainersTest.java b/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/java/org_testcontainers/testcontainers/TestcontainersTest.java index bc8fd7866..4301c020d 100644 --- a/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/java/org_testcontainers/testcontainers/TestcontainersTest.java +++ b/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/java/org_testcontainers/testcontainers/TestcontainersTest.java @@ -17,31 +17,16 @@ import static org.assertj.core.api.Assertions.assertThat; -// This test is pulling testcontainers/ryuk docker image version with many known vulnerabilities. It should be ignored until testcontainers change this image. -// ISSUE: https://github.com/oracle/graalvm-reachability-metadata/issues/250 class TestcontainersTest { private static final boolean DEBUG = false; - // DO NOT REMOVE THIS! READ THE COMMENT ABOVE THE CLASS - // tests should be disabled until testconatiners/ryuk is fixed - private static final boolean IS_DISABLED = true; - @BeforeAll static void beforeAll() { - // DO NOT REMOVE THIS! READ THE COMMENT ABOVE THE CLASS - if (IS_DISABLED) { - return; - } System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", DEBUG ? "debug" : "warn"); } @Test void test() throws Exception { - // DO NOT REMOVE THIS! READ THE COMMENT ABOVE THE CLASS - if (IS_DISABLED) { - return; - } - try (GenericContainer nginx = new GenericContainer<>("nginx:1-alpine-slim")) { nginx.withExposedPorts(80).start(); HttpClient httpClient = HttpClient.newBuilder().build(); diff --git a/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/resources/META-INF/native-image/org/testcontainers/testcontainers/test/resource-config.json b/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/resources/META-INF/native-image/org/testcontainers/testcontainers/test/resource-config.json new file mode 100644 index 000000000..e206d0c44 --- /dev/null +++ b/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/resources/META-INF/native-image/org/testcontainers/testcontainers/test/resource-config.json @@ -0,0 +1,10 @@ +{ + "bundles": [], + "resources": { + "includes": [ + { + "pattern": "\\Qtestcontainers.properties\\E" + } + ] + } +} diff --git a/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/resources/testcontainers.properties b/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/resources/testcontainers.properties index e69de29bb..9e49f0295 100644 --- a/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/resources/testcontainers.properties +++ b/tests/src/org.testcontainers/testcontainers/1.19.8/src/test/resources/testcontainers.properties @@ -0,0 +1 @@ +ryuk.container.image=testcontainers/ryuk:0.10.1 \ No newline at end of file