Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/org/testcontainers/utility/Versioning.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ public boolean isValid() {

@Override
public String getSeparator() {
return "";
return ":";
}

@Override
public String toString() {
return "";
return "latest";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
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"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I'd put the variable declaration onto the next line :)

.withCommand("/bin/sh", "-c", "sleep 0")
.withStartupCheckStrategy(new OneShotStartupCheckStrategy())) {
container.start();
// do nothing other than start and stop
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void testParsing() {
canonicalName = unversionedPart + versionSeparator + version;
} else {
combined = unversionedPart;
canonicalName = unversionedPart;
canonicalName = unversionedPart + ":latest";
}

VisibleAssertions.context("For " + combined);
Expand All @@ -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());

Expand Down