Merge branch 'main' into reusable_exposehostports

Author: TomDeBacker

.github/actions/setup-java/action.yml

@@ -3,7 +3,7 @@ description: Sets up Java version
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         java-version: '8'
         distribution: temurin

.github/actions/setup-junit-report/action.yml

@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Publish Test Report
-      uses: mikepenz/action-junit-report@v3
+      uses: mikepenz/action-junit-report@v4
       if: always() # always run even if the previous step fails
       with:
         report_paths: '**/build/test-results/test/TEST-*.xml'

.github/settings.yml

@@ -388,7 +388,7 @@ branches:
         # Required. Require branches to be up to date before merging.
         strict: true
         # Required. The list of status checks to require in order to merge into this branch
-        contexts: ["core", "check_docs_examples", "in-docker_test", "ci/circleci: minimal_core", "test"]
+        contexts: ["core", "check_docs_examples (:docs:examples:check)", "in-docker_test", "ci/circleci: minimal_core", "test"]
       # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
       enforce_admins: false
       # Prevent merge commits from being pushed to matching branches

.github/workflows/update-gradle-wrapper.yml

@@ -24,4 +24,4 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           labels: dependencies
 
-      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.0.3
+      - uses: gradle/actions/wrapper-validation@v3

core/src/main/java/org/testcontainers/DockerClientFactory.java

@@ -77,7 +77,7 @@ static Map<String, String> markerLabels() {
         return Collections.unmodifiableMap(labels);
     }
 
-    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
+    private static final DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
 
     private static DockerClientFactory instance;
 

core/src/main/java/org/testcontainers/containers/ComposeContainer.java

@@ -165,7 +165,7 @@ public void stop() {
                 if (removeImages != null) {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
-                this.composeDelegate.runWithCompose(this.localCompose, cmd);
+                this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
             } finally {
                 this.project = this.composeDelegate.randomProjectId();
             }

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -172,7 +172,7 @@ public void stop() {
                 if (removeImages != null) {
                     cmd += " --rmi " + removeImages.dockerRemoveImagesType();
                 }
-                this.composeDelegate.runWithCompose(this.localCompose, cmd);
+                this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
             } finally {
                 this.project = this.composeDelegate.randomProjectId();
             }

core/src/main/java/org/testcontainers/containers/PortForwardingContainer.java

@@ -24,18 +24,9 @@ public enum PortForwardingContainer {
 
     private static ContainerDef DEFINITION = new ContainerDef() {
         {
-            setImage(DockerImageName.parse("testcontainers/sshd:1.1.0"));
+            setImage(DockerImageName.parse("testcontainers/sshd:1.2.0"));
             addExposedTcpPort(22);
             addEnvVar("PASSWORD", PASSWORD);
-            setCommand(
-                "sh",
-                "-c",
-                // Disable ipv6 & Make it listen on all interfaces, not just localhost
-                // Enable algorithms supported by our ssh client library
-                "echo \"root:$PASSWORD\" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes " +
-                "-o AddressFamily=inet -o GatewayPorts=yes -o AllowAgentForwarding=yes -o AllowTcpForwarding=yes " +
-                "-o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostkeyAlgorithms=+ssh-rsa "
-            );
         }
     };
 

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

@@ -11,6 +11,9 @@
 import lombok.SneakyThrows;
 import lombok.ToString;
 import lombok.With;
+import org.awaitility.Awaitility;
+import org.awaitility.pollinterval.IterativePollInterval;
+import org.awaitility.pollinterval.PollInterval;
 import org.slf4j.Logger;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ContainerFetchException;
@@ -21,9 +24,11 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicReference;
 
 @ToString
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
@@ -65,7 +70,7 @@ public RemoteDockerImage(@NonNull Future<String> imageFuture) {
     @SneakyThrows({ InterruptedException.class, ExecutionException.class })
     protected final String resolve() {
         final DockerImageName imageName = getImageName();
-        Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
+        final Logger logger = DockerLoggerFactory.getLogger(imageName.toString());
         try {
             if (!imagePullPolicy.shouldPull(imageName)) {
                 return imageName.asCanonicalNameString();
@@ -77,55 +82,88 @@ protected final String resolve() {
                 imageName
             );
 
-            Exception lastFailure = null;
+            final Instant startedAt = Instant.now();
             final Instant lastRetryAllowed = Instant.now().plus(PULL_RETRY_TIME_LIMIT);
-
-            Instant startedAt = Instant.now();
-            while (Instant.now().isBefore(lastRetryAllowed)) {
-                try {
-                    PullImageCmd pullImageCmd = dockerClient
-                        .pullImageCmd(imageName.getUnversionedPart())
-                        .withTag(imageName.getVersionPart());
-
-                    try {
-                        pullImageCmd.exec(new TimeLimitedLoggedPullImageResultCallback(logger)).awaitCompletion();
-                    } catch (DockerClientException e) {
-                        // Try to fallback to x86
-                        pullImageCmd
-                            .withPlatform("linux/amd64")
-                            .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
-                            .awaitCompletion();
-                    }
-                    String dockerImageName = imageName.asCanonicalNameString();
-                    logger.info("Image {} pull took {}", dockerImageName, Duration.between(startedAt, Instant.now()));
-
-                    LocalImagesCache.INSTANCE.refreshCache(imageName);
-
-                    return dockerImageName;
-                } catch (InterruptedException | InternalServerErrorException e) {
-                    // these classes of exception often relate to timeout/connection errors so should be retried
-                    lastFailure = e;
-                    logger.warn(
-                        "Retrying pull for image: {} ({}s remaining)",
-                        imageName,
-                        Duration.between(Instant.now(), lastRetryAllowed).getSeconds()
-                    );
-                }
+            final AtomicReference<Exception> lastFailure = new AtomicReference<>();
+            final PullImageCmd pullImageCmd = dockerClient
+                .pullImageCmd(imageName.getUnversionedPart())
+                .withTag(imageName.getVersionPart());
+            final AtomicReference<String> dockerImageName = new AtomicReference<>();
+
+            // The following poll interval in ms: 50, 100, 200, 400, 800....
+            // Results in ~70 requests in over 2 minutes
+            final PollInterval interval = IterativePollInterval
+                .iterative(duration -> duration.multipliedBy(2))
+                .startDuration(Duration.ofMillis(50));
+
+            Awaitility
+                .await()
+                .pollInSameThread()
+                .pollDelay(Duration.ZERO) // start checking immediately
+                .atMost(PULL_RETRY_TIME_LIMIT)
+                .pollInterval(interval)
+                .until(
+                    tryImagePullCommand(pullImageCmd, logger, dockerImageName, imageName, lastFailure, lastRetryAllowed)
+                );
+
+            if (dockerImageName.get() == null) {
+                final Exception lastException = lastFailure.get();
+                logger.error(
+                    "Failed to pull image: {}. Please check output of `docker pull {}`",
+                    imageName,
+                    imageName,
+                    lastException
+                );
+                throw new ContainerFetchException("Failed to pull image: " + imageName, lastException);
             }
 
-            logger.error(
-                "Failed to pull image: {}. Please check output of `docker pull {}`",
-                imageName,
-                imageName,
-                lastFailure
-            );
-
-            throw new ContainerFetchException("Failed to pull image: " + imageName, lastFailure);
+            logger.info("Image {} pull took {}", dockerImageName.get(), Duration.between(startedAt, Instant.now()));
+            LocalImagesCache.INSTANCE.refreshCache(imageName);
+            return dockerImageName.get();
         } catch (DockerClientException e) {
             throw new ContainerFetchException("Failed to get Docker client for " + imageName, e);
         }
     }
 
+    private Callable<Boolean> tryImagePullCommand(
+        PullImageCmd pullImageCmd,
+        Logger logger,
+        AtomicReference<String> dockerImageName,
+        DockerImageName imageName,
+        AtomicReference<Exception> lastFailure,
+        Instant lastRetryAllowed
+    ) {
+        return () -> {
+            try {
+                pullImage(pullImageCmd, logger);
+                dockerImageName.set(imageName.asCanonicalNameString());
+                return true;
+            } catch (InterruptedException | InternalServerErrorException e) {
+                // these classes of exception often relate to timeout/connection errors so should be retried
+                lastFailure.set(e);
+                logger.warn(
+                    "Retrying pull for image: {} ({}s remaining)",
+                    imageName,
+                    Duration.between(Instant.now(), lastRetryAllowed).getSeconds()
+                );
+                return false;
+            }
+        };
+    }
+
+    private TimeLimitedLoggedPullImageResultCallback pullImage(PullImageCmd pullImageCmd, Logger logger)
+        throws InterruptedException {
+        try {
+            return pullImageCmd.exec(new TimeLimitedLoggedPullImageResultCallback(logger)).awaitCompletion();
+        } catch (DockerClientException e) {
+            // Try to fallback to x86
+            return pullImageCmd
+                .withPlatform("linux/amd64")
+                .exec(new TimeLimitedLoggedPullImageResultCallback(logger))
+                .awaitCompletion();
+        }
+    }
+
     private DockerImageName getImageName() throws InterruptedException, ExecutionException {
         final DockerImageName specifiedImageName = imageNameFuture.get();
 

core/src/test/java/org/testcontainers/TestImages.java

@@ -6,7 +6,7 @@ public interface TestImages {
     DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:3.0.2");
     DockerImageName RABBITMQ_IMAGE = DockerImageName.parse("rabbitmq:3.5.3");
     DockerImageName MONGODB_IMAGE = DockerImageName.parse("mongo:3.1.5");
-    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.16");
+    DockerImageName ALPINE_IMAGE = DockerImageName.parse("alpine:3.17");
     DockerImageName DOCKER_REGISTRY_IMAGE = DockerImageName.parse("registry:2.7.0");
-    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.16");
+    DockerImageName TINY_IMAGE = DockerImageName.parse("alpine:3.17");
 }