Merge remote-tracking branch 'origin/master' into deprecate-ambiguous-constructors

Author: rnorth

.github/workflows/release-drafter.yml

@@ -9,6 +9,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5.2.0
+      - uses: release-drafter/release-drafter@v5.9.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

azure-pipelines.yml

@@ -14,7 +14,7 @@ jobs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
         options: "--no-daemon --continue"
-        tasks: "testcontainers:test --tests GenericContainerRuleTest"
+        tasks: "clean testcontainers:test --tests GenericContainerRuleTest"
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
@@ -31,6 +31,6 @@ jobs:
         gradleWrapperFile: 'gradlew'
         jdkVersionOption: '1.11'
         options: '--no-daemon --continue'
-        tasks: 'check'
+        tasks: 'clean check'
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'

core/build.gradle

@@ -104,7 +104,7 @@ if (!org.gradle.internal.os.OperatingSystem.current().isWindows()) {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.14.2', {
+    baseline 'org.testcontainers:testcontainers:1.14.3', {
         exclude group: "*", module: "*"
     }
 

core/src/main/java/org/testcontainers/images/ParsedDockerfile.java

@@ -21,7 +21,7 @@
 @Slf4j
 public class ParsedDockerfile {
 
-    private static final Pattern FROM_LINE_PATTERN = Pattern.compile("FROM ([^\\s]+).*");
+    private static final Pattern FROM_LINE_PATTERN = Pattern.compile("FROM (?<arg>--[^\\s]+\\s)*(?<image>[^\\s]+).*", Pattern.CASE_INSENSITIVE);
 
     private final Path dockerFilePath;
 
@@ -57,7 +57,7 @@ private void parse(List<String> lines) {
         dependencyImageNames = lines.stream()
             .map(FROM_LINE_PATTERN::matcher)
             .filter(Matcher::matches)
-            .map(matcher -> matcher.group(1))
+            .map(matcher -> matcher.group("image"))
             .collect(Collectors.toSet());
 
         if (!dependencyImageNames.isEmpty()) {

core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java

@@ -107,6 +107,12 @@ public void onNext(BuildResponseItem item) {
 
             BuildImageCmd buildImageCmd = dockerClient.buildImageCmd(in);
             configure(buildImageCmd);
+            Map<String, String> labels = new HashMap<>();
+            if (buildImageCmd.getLabels() != null) {
+                labels.putAll(buildImageCmd.getLabels());
+            }
+            labels.putAll(DockerClientFactory.DEFAULT_LABELS);
+            buildImageCmd.withLabels(labels);
 
             prePullDependencyImages(dependencyImageNames);
 

core/src/main/java/org/testcontainers/utility/ResourceReaper.java

@@ -1,10 +1,12 @@
 package org.testcontainers.utility;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Ports;
@@ -28,6 +30,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.Socket;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -93,6 +96,20 @@ public static String start(String hostIpAddress, DockerClient client) {
 
         client.startContainerCmd(ryukContainerId).exec();
 
+        StringBuilder ryukLog = new StringBuilder();
+
+        client.logContainerCmd(ryukContainerId)
+            .withSince(0)
+            .withFollowStream(true)
+            .withStdOut(true)
+            .withStdErr(true)
+            .exec(new ResultCallback.Adapter<Frame>() {
+                @Override
+                public void onNext(Frame frame) {
+                    ryukLog.append(new String(frame.getPayload(), StandardCharsets.UTF_8));
+                }
+            });
+
         InspectContainerResponse inspectedContainer = client.inspectContainerCmd(ryukContainerId).exec();
 
         Integer ryukPort = inspectedContainer.getNetworkSettings().getPorts().getBindings().values().stream()
@@ -155,7 +172,8 @@ public static String start(String hostIpAddress, DockerClient client) {
 
         // We need to wait before we can start any containers to make sure that we delete them
         if (!ryukScheduledLatch.await(TestcontainersConfiguration.getInstance().getRyukTimeout(), TimeUnit.SECONDS)) {
-            throw new IllegalStateException("Can not connect to Ryuk");
+            log.error("Timeout out waiting for Ryuk. Ryuk's log:\n{}", ryukLog);
+            throw new IllegalStateException(String.format("Can not connect to Ryuk at %s:%s", hostIpAddress, ryukPort));
         }
 
         return ryukContainerId;

core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java

@@ -1,11 +1,22 @@
 package org.testcontainers.utility;
 
 import com.google.common.annotations.VisibleForTesting;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.UnstableAPI;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Objects;
@@ -56,7 +67,7 @@ public String getSocatContainerImage() {
     }
 
     public String getVncRecordedContainerImage() {
-        return (String) properties.getOrDefault("vncrecorder.container.image", "quay.io/testcontainers/vnc-recorder:1.1.0");
+        return (String) properties.getOrDefault("vncrecorder.container.image", "testcontainersofficial/vnc-recorder:1.1.0");
     }
 
     public String getDockerComposeContainerImage() {
@@ -72,11 +83,11 @@ public boolean isRyukPrivileged() {
     }
 
     public String getRyukImage() {
-        return (String) properties.getOrDefault("ryuk.container.image", "quay.io/testcontainers/ryuk:0.2.3");
+        return (String) properties.getOrDefault("ryuk.container.image", "testcontainersofficial/ryuk:0.3.0");
     }
 
     public String getSSHdImage() {
-        return (String) properties.getOrDefault("sshd.container.image", "quay.io/testcontainers/sshd:1.0.0");
+        return (String) properties.getOrDefault("sshd.container.image", "testcontainersofficial/sshd:1.0.0");
     }
 
     public Integer getRyukTimeout() {

core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java

@@ -16,6 +16,12 @@ public void doesSimpleParsing() {
         assertEquals("extracts a single image name", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
     }
 
+    @Test
+    public void isCaseInsensitive() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("from someimage", "RUN something"));
+        assertEquals("extracts a single image name", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
     @Test
     public void handlesTags() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM someimage:tag", "RUN something"));
@@ -40,6 +46,18 @@ public void ignoringBuildStageNames() {
         assertEquals("ignores build stage names and allows multiple images to be extracted", Sets.newHashSet("someimage", "nextimage"), parsedDockerfile.getDependencyImageNames());
     }
 
+    @Test
+    public void ignoringPlatformArgs() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM --platform=linux/amd64 someimage", "RUN something"));
+               assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
+    @Test
+    public void ignoringExtraPlatformArgs() {
+        final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("FROM --platform=linux/amd64 --somethingelse=value someimage", "RUN something"));
+               assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
+    }
+
     @Test
     public void handlesGracefullyIfNoFromLine() {
         final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(asList("RUN something", "# is this even a valid Dockerfile?"));

core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java

@@ -0,0 +1,27 @@
+package org.testcontainers.images.builder;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ImageFromDockerfileTest {
+
+    @Test
+    public void shouldAddDefaultLabels() {
+        ImageFromDockerfile image = new ImageFromDockerfile()
+            .withDockerfileFromBuilder(it -> it.from("scratch"));
+
+        String imageId = image.resolve();
+
+        DockerClient dockerClient = DockerClientFactory.instance().client();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+
+        assertThat(inspectImageResponse.getConfig().getLabels())
+            .containsAllEntriesOf(DockerClientFactory.DEFAULT_LABELS);
+    }
+
+}

docs/features/configuration.md

@@ -32,7 +32,7 @@ Some companies disallow the usage of Docker Hub, but you can override `*.image`
 > **tinyimage.container.image = alpine:3.5**  
 > Used by Testcontainers' core
 
-> **vncrecorder.container.image = quay.io/testcontainers/vnc-recorder:1.1.0**  
+> **vncrecorder.container.image = testcontainersofficial/vnc-recorder:1.1.0**  
 > Used by VNC recorder in Testcontainers' Seleniun integration
 
 > **ambassador.container.image = richnorth/ambassador:latest**  
@@ -49,13 +49,11 @@ Another possibility is to set up a registry mirror in your environment so that a
 For more information, see the [official Docker documentation about "Registry as a pull through cache"](https://docs.docker.com/registry/recipes/mirror/).
 
 !!!tip
-    Registry mirror currently only works for Docker images with image name that has no registry specified (for example, for Docker image `mariadb:10.3.6`, it works, for Docker image `quay.io/testcontainers/ryuk:0.2.3`, not).
-    Workaround is to to configure the affected Docker image in `.testcontainers.properties`.
-    For example: `ryuk.container.image = testcontainers/ryuk:0.2.3` or `ryuk.container.image = <your.docker.registry>/testcontainers/ryuk:0.2.3`
+    Registry mirror currently only works for Docker images with image name that has no registry specified (for example, for Docker image `mariadb:10.3.6`, it works, for Docker image `quay.io/something/else`, not).
 
 ## Customizing Ryuk resource reaper
 
-> **ryuk.container.image = quay.io/testcontainers/ryuk:0.2.3**
+> **ryuk.container.image = testcontainersofficial/ryuk:0.3.0**
 > The resource reaper is responsible for container removal and automatic cleanup of dead containers at JVM shutdown
 
 > **ryuk.container.privileged = false**

docs/modules/databases/jdbc.md

@@ -115,5 +115,5 @@ Note that if you use `@Rule`, you will be given an isolated container for each t
 
 Examples/Tests:
 
- * [MySQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimpleMySQLTest.java)
- * [PostgreSQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/jdbc-test/src/test/java/org/testcontainers/junit/SimplePostgreSQLTest.java)
+ * [MySQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/mysql/src/test/java/org/testcontainers/junit/mysql/SimpleMySQLTest.java)
+ * [PostgreSQL](https://github.com/testcontainers/testcontainers-java/blob/master/modules/postgresql/src/test/java/org/testcontainers/junit/postgresql/SimplePostgreSQLTest.java)

examples/solr-container/build.gradle

@@ -10,7 +10,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:1.18.10"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
 
-    implementation 'org.apache.solr:solr-solrj:8.5.1'
+    implementation 'org.apache.solr:solr-solrj:8.5.2'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

mkdocs.yml

@@ -90,4 +90,4 @@ nav:
           - contributing.md
           - contributing_docs.md
 extra:
-    latest_version: 1.14.2
+    latest_version: 1.14.3