testcontainers · bsideup · Feb 6, 2021 · Oct 7, 2020 · Oct 11, 2020 · Oct 11, 2020
diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
@@ -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}})

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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}})

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -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
diff --git a/core/build.gradle b/core/build.gradle
@@ -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}"

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
@@ -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()

diff --git a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
@@ -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");

diff --git a/core/src/main/java/org/testcontainers/utility/Versioning.java b/core/src/main/java/org/testcontainers/utility/Versioning.java
@@ -24,12 +24,12 @@ public boolean isValid() {
 
         @Override
         public String getSeparator() {
-            return "";
+            return ":";
         }
 
         @Override
         public String toString() {
-            return "";
+            return "latest";
         }
 
         @Override

diff --git a/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/AmbiguousImagePullTest.java
@@ -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
+        }
+    }
+}
diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
@@ -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());
 

diff --git a/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java b/docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
@@ -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());
     }
 }
diff --git a/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java b/docs/examples/junit4/generic/src/test/java/generic/MultiplePortsExposedTest.java
@@ -1,29 +1,29 @@
 package generic;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 public class MultiplePortsExposedTest {
     private static final Logger log = getLogger(MultiplePortsExposedTest.class);
 
 
     @Rule
     // rule {
-    public GenericContainer container = new GenericContainer(DockerImageName.parse("orientdb:3.0.13"))
-        .withExposedPorts(2424, 2480)
+    public GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("testcontainers/helloworld:1.1.0"))
+        .withExposedPorts(8080, 8081)
         .withLogConsumer(new Slf4jLogConsumer(log));
     // }
 
     @Test
     public void fetchPortsByNumber() {
-        Integer firstMappedPort = container.getMappedPort(2424);
-        Integer secondMappedPort = container.getMappedPort(2480);
+        Integer firstMappedPort = container.getMappedPort(8080);
+        Integer secondMappedPort = container.getMappedPort(8081);
     }
 
     @Test
@@ -39,6 +39,6 @@ public void getHostOnly() {
     @Test
     public void getHostAndMappedPort() {
         String address =
-            container.getHost() + ":" + container.getMappedPort(2424);
+            container.getHost() + ":" + container.getMappedPort(8080);
     }
 }
diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
@@ -0,0 +1,44 @@
+# GCloud Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+Testcontainers module for the Google's [Cloud SDK](https://cloud.google.com/sdk/).
+
+Currently, the module supports `Datastore`, `Firestore`, `Pub/Sub` and `Spanner` emulators. In order to use it, you should use the following classes:
+
+* DatastoreEmulatorContainer
+* FirestoreEmulatorContainer
+* PubSubEmulatorContainer
+* SpannerEmulatorContainer
+
+## Usage example
+
+Running GCloud as a stand-in for Google Datastore during a test:
+
+<!--codeinclude-->
+[Creating a Datastore container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:creatingDatastoreEmulatorContainer
+<!--/codeinclude-->
+
+And how to start it:
+
+<!--codeinclude-->
+[Starting a Datastore container](../../modules/gcloud/src/test/java/org/testcontainers/containers/DatastoreEmulatorContainerTest.java) inside_block:startingDatastoreEmulatorContainer
+<!--/codeinclude-->
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:gcloud:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>gcloud</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
diff --git a/examples/cucumber/build.gradle b/examples/cucumber/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.seleniumhq.selenium:selenium-remote-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     implementation 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59'
-    testImplementation 'io.cucumber:cucumber-java:6.6.0'
-    testImplementation 'io.cucumber:cucumber-junit:6.7.0'
+    testImplementation 'io.cucumber:cucumber-java:6.8.1'
+    testImplementation 'io.cucumber:cucumber-junit:6.8.1'
     testImplementation 'org.testcontainers:selenium'
 }
diff --git a/examples/disque-job-queue/build.gradle b/examples/disque-job-queue/build.gradle
@@ -7,8 +7,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.12"
-    annotationProcessor "org.projectlombok:lombok:1.18.10"
+    compileOnly "org.projectlombok:lombok:1.18.14"
+    annotationProcessor "org.projectlombok:lombok:1.18.14"
     implementation 'biz.paluch.redis:spinach:0.3'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'

diff --git a/examples/kafka-cluster/build.gradle b/examples/kafka-cluster/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     compile 'org.apache.kafka:kafka-clients:2.3.1'
     testCompile 'org.assertj:assertj-core:3.14.0'
     testCompile 'com.google.guava:guava:23.0'
-    testCompile 'org.slf4j:slf4j-simple:+'
+    testCompile 'org.slf4j:slf4j-simple:1.7.30'
 }
diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'org.json:json:20180813'
-    testImplementation 'org.postgresql:postgresql:42.2.16'
+    testImplementation 'org.postgresql:postgresql:42.2.17'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.testcontainers:postgresql'
 }

diff --git a/examples/mongodb-container/build.gradle b/examples/mongodb-container/build.gradle
@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     testCompileClasspath 'org.jetbrains:annotations:20.1.0'
 }
diff --git a/examples/redis-backed-cache-testng/build.gradle b/examples/redis-backed-cache-testng/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
-    testImplementation 'org.testng:testng:7.2.0'
+    testImplementation 'org.testng:testng:7.3.0'
 }
 
 test {

diff --git a/examples/redis-backed-cache/build.gradle b/examples/redis-backed-cache/build.gradle
@@ -12,6 +12,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:23.0'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }
diff --git a/examples/selenium-container/build.gradle b/examples/selenium-container/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.3.3.RELEASE'
+    id 'org.springframework.boot' version '2.3.4.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'
 

diff --git a/examples/solr-container/build.gradle b/examples/solr-container/build.gradle
@@ -7,10 +7,10 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.10"
+    compileOnly "org.projectlombok:lombok:1.18.14"
     annotationProcessor "org.projectlombok:lombok:1.18.10"
 
-    implementation 'org.apache.solr:solr-solrj:8.6.2'
+    implementation 'org.apache.solr:solr-solrj:8.6.3'
 
     testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'org.testcontainers:solr'

diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.3.3.RELEASE'
+    id 'org.springframework.boot' version '2.3.4.RELEASE'
 }
 apply plugin: 'io.spring.dependency-management'