From 360702aafe71abd60a9693a047b3cbe9eeb39715 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Wed, 13 Jun 2018 09:49:43 +0200 Subject: [PATCH] Use latest tag as default if no tag is specified (#744) Fixes #676 --- .../main/java/org/testcontainers/utility/DockerImageName.java | 2 +- .../java/org/testcontainers/dockerclient/ImagePullTest.java | 1 + .../java/org/testcontainers/utility/DockerImageNameTest.java | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/testcontainers/utility/DockerImageName.java b/core/src/main/java/org/testcontainers/utility/DockerImageName.java index 212b81a20eb..50b2d57b743 100644 --- a/core/src/main/java/org/testcontainers/utility/DockerImageName.java +++ b/core/src/main/java/org/testcontainers/utility/DockerImageName.java @@ -45,7 +45,7 @@ public DockerImageName(String name) { versioning = new TagVersioning(remoteName.split(":")[1]); } else { repo = remoteName; - versioning = null; + versioning = new TagVersioning("latest"); } } diff --git a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java index f06ff40fc40..bfd03d2c9be 100644 --- a/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java +++ b/core/src/test/java/org/testcontainers/dockerclient/ImagePullTest.java @@ -16,6 +16,7 @@ public static String[] parameters() { return new String[] { "alpine:latest", "alpine:3.6", + "alpine", // omitting the tag should work and default to latest "alpine@sha256:8fd4b76819e1e5baac82bd0a3d03abfe3906e034cc5ee32100d12aaaf3956dc7", "gliderlabs/alpine:latest", "gliderlabs/alpine:3.5", diff --git a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java index 3fedbc19df3..caef1bcf9ec 100644 --- a/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java +++ b/core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java @@ -24,7 +24,6 @@ public void validNames() { @Test public void invalidNames() { - testInvalid("myname"); testInvalid(":latest"); testInvalid("/myname:latest"); testInvalid("/myname@sha256:latest");