testcontainers
diff --git a/‎.github/workflows/ci-examples.yml‎
Lines changed: 2 additions & 4 deletions b/‎.github/workflows/ci-examples.yml‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 0 additions & 4 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎.github/workflows/update-gradle-wrapper.yml‎
Lines changed: 20 additions & 0 deletions b/‎.github/workflows/update-gradle-wrapper.yml‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎core/build.gradle‎
Lines changed: 4 additions & 4 deletions b/‎core/build.gradle‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java‎
Lines changed: 3 additions & 3 deletions b/‎core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎core/src/main/java/org/testcontainers/utility/DockerMachineClient.java‎
Lines changed: 8 additions & 0 deletions b/‎core/src/main/java/org/testcontainers/utility/DockerMachineClient.java‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎core/src/main/java/org/testcontainers/utility/Versioning.java‎
Lines changed: 2 additions & 2 deletions b/‎core/src/main/java/org/testcontainers/utility/Versioning.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java‎
Lines changed: 34 additions & 0 deletions b/‎core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java‎
Lines changed: 34 additions & 0 deletions
diff --git a/‎core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java‎
Lines changed: 2 additions & 2 deletions b/‎core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java‎
Lines changed: 3 additions & 3 deletions b/‎docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java‎
Lines changed: 3 additions & 3 deletions
@@ -20,11 +20,10 @@ jobs:
           java-version: '1.8'
       - name: Cache Gradle Home files
         uses: actions/cache@v1
+        continue-on-error: true
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-examples-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-testmatrix-examples-
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -48,11 +47,10 @@ jobs:
           java-version: '1.8'
       - name: Cache Gradle Home files
         uses: actions/cache@v1
+        continue-on-error: true
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-
       - name: Clear existing docker image cache
         run: docker image prune -af
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
 
@@ -23,8 +23,6 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-testmatrix-
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -51,8 +49,6 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-
       - name: Clear existing docker image cache
         run: docker image prune -af
       - name: Build and test with Gradle (${{matrix.gradle_args}})
 
@@ -0,0 +1,20 @@
+name: Update Gradle Wrapper
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Update Gradle Wrapper
+        uses: gradle-update/update-gradle-wrapper-action@74a035c
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          labels: dependencies
+
+      - uses: gradle/wrapper-validation-action@e2c57ac
@@ -192,11 +192,11 @@ dependencies {
 
     compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.5'
 
-    shaded "org.yaml:snakeyaml:1.25"
+    shaded "org.yaml:snakeyaml:1.27"
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
-    shaded 'org.zeroturnaround:zt-exec:1.10', {
+    shaded 'org.zeroturnaround:zt-exec:1.12', {
         exclude(group: 'org.slf4j')
     }
 
@@ -205,13 +205,13 @@ dependencies {
     testCompile 'com.rabbitmq:amqp-client:5.9.0'
     testCompile 'org.mongodb:mongo-java-driver:3.12.7'
 
-    testCompile ('org.mockito:mockito-core:3.5.11') {
+    testCompile ('org.mockito:mockito-core:3.5.13') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest
     testCompile files('testlib/repo/fakejar/fakejar/0/fakejar-0.jar')
 
-    testCompile 'org.assertj:assertj-core:3.17.1'
+    testCompile 'org.assertj:assertj-core:3.17.2'
     testCompile project(':test-support')
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
 
@@ -37,12 +37,12 @@ private TransportConfig resolveTransportConfig() throws InvalidConfigurationExce
 
         DockerMachineClient.instance().ensureMachineRunning(machineName);
 
-        String dockerDaemonIpAddress = DockerMachineClient.instance().getDockerDaemonIpAddress(machineName);
+        String dockerDaemonUrl = DockerMachineClient.instance().getDockerDaemonUrl(machineName);
 
-        log.info("Docker daemon IP address for docker machine {} is {}", machineName, dockerDaemonIpAddress);
+        log.info("Docker daemon URL for docker machine {} is {}", machineName, dockerDaemonUrl);
 
         return TransportConfig.builder()
-            .dockerHost(URI.create("tcp://" + dockerDaemonIpAddress + ":2376"))
+            .dockerHost(URI.create(dockerDaemonUrl))
             .sslConfig(
                 new LocalDirectorySSLConfig(
                     Paths.get(System.getProperty("user.home") + "/.docker/machine/certs/").toString()
 
@@ -79,10 +79,18 @@ public void ensureMachineRunning(@NonNull String machineName) {
         }
     }
 
+    /**
+     * @deprecated Use getDockerDaemonUrl(@NonNull String machineName) for connection to docker-machine
+     */
+    @Deprecated
     public String getDockerDaemonIpAddress(@NonNull String machineName) {
         return runShellCommand(executableName, "ip", machineName);
     }
 
+    public String getDockerDaemonUrl(@NonNull String machineName) {
+        return runShellCommand(executableName, "url", machineName);
+    }
+
     public boolean isMachineRunning(String machineName) {
         String status = runShellCommand("docker-machine", "status", machineName);
         return status.trim().equalsIgnoreCase("running");
 
@@ -24,12 +24,12 @@ public boolean isValid() {
 
         @Override
         public String getSeparator() {
-            return "";
+            return ":";
         }
 
         @Override
         public String toString() {
-            return "";
+            return "latest";
         }
 
         @Override
 
@@ -0,0 +1,34 @@
+package org.testcontainers.dockerclient;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Image;
+import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.List;
+
+public class AmbiguousImagePullTest {
+
+    @Test(timeout = 30_000)
+    public void testNotUsingParse() {
+        DockerClient client = DockerClientFactory.instance().client();
+        List<Image> alpineImages = client.listImagesCmd()
+            .withImageNameFilter("alpine:latest")
+            .exec();
+        for (Image alpineImage : alpineImages) {
+            client.removeImageCmd(alpineImage.getId()).exec();
+        }
+
+        try (
+            final GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("alpine"))
+                .withCommand("/bin/sh", "-c", "sleep 0")
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy())
+        ) {
+            container.start();
+            // do nothing other than start and stop
+        }
+    }
+}
@@ -112,7 +112,7 @@ public void testParsing() {
                 canonicalName = unversionedPart + versionSeparator + version;
             } else {
                 combined = unversionedPart;
-                canonicalName = unversionedPart;
+                canonicalName = unversionedPart + ":latest";
             }
 
             VisibleAssertions.context("For " + combined);
@@ -124,7 +124,7 @@ public void testParsing() {
             if (version != null) {
                 assertEquals(combined + " has version part: " + version, version, imageName.getVersionPart());
             } else {
-                assertEquals(combined + " has no version specified", "", imageName.getVersionPart());
+                assertEquals(combined + " has automatic 'latest' version specified", "latest", imageName.getVersionPart());
             }
             assertEquals(combined + " has canonical name: " + canonicalName, canonicalName, imageName.asCanonicalNameString());
 
 
@@ -19,8 +19,8 @@ public class CmdModifierTest {
     // }
 
     // memory {
-    private long memoryInBytes = 8 * 1024 * 1024;
-    private long memorySwapInBytes = 12 * 1024 * 1024;
+    private long memoryInBytes = 32 * 1024 * 1024;
+    private long memorySwapInBytes = 64 * 1024 * 1024;
 
     @Rule
     public GenericContainer memoryLimitedRedis = new GenericContainer<>(DockerImageName.parse("redis:3.0.2"))
@@ -40,6 +40,6 @@ public void testHostnameModified() throws IOException, InterruptedException {
     @Test
     public void testMemoryLimitModified() throws IOException, InterruptedException {
         final Container.ExecResult execResult = memoryLimitedRedis.execInContainer("cat", "/sys/fs/cgroup/memory/memory.limit_in_bytes");
-        assertEquals("8388608", execResult.getStdout().trim());
+        assertEquals(String.valueOf(memoryInBytes), execResult.getStdout().trim());
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,18 @@ public void ensureMachineRunning(@NonNull String machineName) {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ /**`
	`83`	`+ * @deprecated Use getDockerDaemonUrl(@NonNull String machineName) for connection to docker-machine`
	`84`	`+ */`
	`85`	`+ @Deprecated`
`82`	`86`	`public String getDockerDaemonIpAddress(@NonNull String machineName) {`
`83`	`87`	`return runShellCommand(executableName, "ip", machineName);`
`84`	`88`	`}`
`85`	`89`
	`90`	`+ public String getDockerDaemonUrl(@NonNull String machineName) {`
	`91`	`+ return runShellCommand(executableName, "url", machineName);`
	`92`	`+ }`
	`93`	`+`
`86`	`94`	`public boolean isMachineRunning(String machineName) {`
`87`	`95`	`String status = runShellCommand("docker-machine", "status", machineName);`
`88`	`96`	`return status.trim().equalsIgnoreCase("running");`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ public boolean isValid() {`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public String getSeparator() {`
`27`		`- return "";`
	`27`	`+ return ":";`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
`31`	`31`	`public String toString() {`
`32`		`- return "";`
	`32`	`+ return "latest";`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`