Skip to content

Keep full tag when parsing image names with extra colons #12107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SamuelAdigos wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Keep full tag when parsing image names with extra colons #12107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions core/src/main/java/org/testcontainers/utility/DockerImageName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,12 @@ public DockerImageName(String fullImageName) {
versioning = new Sha256Versioning(remoteName.split("@sha256:")[1]);
}
} else if (remoteName.contains(":")) {
repository = remoteName.split(":")[0];
versioning = new TagVersioning(remoteName.split(":")[1]);
String[] repositoryAndTag = remoteName.split(":", 2);
if (repositoryAndTag[1].isEmpty()) {
throw new IllegalArgumentException("Missing tag after ':' in image name " + fullImageName);
}
repository = repositoryAndTag[0];
versioning = new TagVersioning(repositoryAndTag[1]);
} else {
repository = remoteName;
versioning = Versioning.ANY;
Expand Down
19 changes: 19 additions & 0 deletions core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ public static String[] getNames() {
"/myname@sha256:latest",
"/myname@sha256:gggggggggggggggggggggggggggggggg",
"repo:notaport/myname:latest",
"myname:myname:1.0",
"repo/my-name:1.0:extra",
"registry.foo.com:1234/my-name:1.0:extra",
};
}

Expand Down Expand Up @@ -149,6 +152,22 @@ void testParsing(
.isEqualTo(version);
}
}

@Test
void testExtraColonInTagIsNotDropped() {
final DockerImageName imageName = DockerImageName.parse("neo4j:neo4j:4.4");

assertThat(imageName.getRepository()).isEqualTo("neo4j");
assertThat(imageName.getVersionPart()).isEqualTo("neo4j:4.4");
assertThat(imageName.asCanonicalNameString()).isEqualTo("neo4j:neo4j:4.4");
}

@Test
void testEmptyTagIsRejected() {
assertThatThrownBy(() -> DockerImageName.parse("myname:"))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("myname:");
}
}

@Nested
Expand Down
Loading