Skip to content

Commit 84e1a07

Browse files
bedlabedla
committed
4762 Fix DockerImageName parsing when tag and digest are used
Based on grammer from https://github.com/distribution/reference/blob/v0.6.0/reference.go#L1-L26
1 parent 43c6a97 commit 84e1a07

File tree

3 files changed

+70
-29
lines changed

3 files changed

+70
-29
lines changed

‎core/src/main/java/org/testcontainers/utility/DockerImageName.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,15 @@ public DockerImageName(String fullImageName) {
8787
}
8888

8989
if (remoteName.contains("@sha256:")) {
90-
repository = remoteName.split("@sha256:")[0];
91-
versioning = new Sha256Versioning(remoteName.split("@sha256:")[1]);
90+
String[] parts = remoteName.split("@sha256:");
91+
if (parts[0].contains(":")) {
92+
String[] repositoryAndTag = parts[0].split(":");
93+
repository = repositoryAndTag[0];
94+
versioning = new Versioning.TagSha256Versioning(repositoryAndTag[1], parts[1]);
95+
} else {
96+
repository = parts[0];
97+
versioning = new Sha256Versioning(parts[1]);
98+
}
9299
} else if (remoteName.contains(":")) {
93100
repository = remoteName.split(":")[0];
94101
versioning = new TagVersioning(remoteName.split(":")[1]);

‎core/src/main/java/org/testcontainers/utility/Versioning.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,36 @@ public String toString() {
9898
return "sha256:" + hash;
9999
}
100100
}
101+
102+
@EqualsAndHashCode
103+
class TagSha256Versioning implements Versioning {
104+
105+
public static final String TAG_REGEX = "[\\w][\\w.\\-]{0,127}";
106+
107+
public static final String HASH_REGEX = "[0-9a-fA-F]{32,}";
108+
109+
private final String tag;
110+
111+
private final String hash;
112+
113+
TagSha256Versioning(String tag, String hash) {
114+
this.tag = tag;
115+
this.hash = hash;
116+
}
117+
118+
@Override
119+
public boolean isValid() {
120+
return tag.matches(TAG_REGEX) && hash.matches(HASH_REGEX);
121+
}
122+
123+
@Override
124+
public String getSeparator() {
125+
return ":";
126+
}
127+
128+
@Override
129+
public String toString() {
130+
return tag + "@sha256:" + hash;
131+
}
132+
}
101133
}

‎core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static String[] getNames() {
2424
"registry.foo.com:1234/repo_here/my-name:1.0",
2525
"registry.foo.com:1234/repo-here/my-name@sha256:1234abcd1234abcd1234abcd1234abcd",
2626
"registry.foo.com:1234/my-name@sha256:1234abcd1234abcd1234abcd1234abcd",
27+
"registry.foo.com:1234/my-name:my-tag@sha256:1234abcd1234abcd1234abcd1234abcd",
2728
"1.2.3.4/my-name:1.0",
2829
"1.2.3.4:1234/my-name:1.0",
2930
"1.2.3.4/repo-here/my-name:1.0",
@@ -64,33 +65,34 @@ class Parsing {
6465

6566
public static Stream<Arguments> getNames() {
6667
return Stream.of(
67-
Arguments.of("", "", "myname", ":", null),
68-
Arguments.of("", "", "myname", ":", "latest"),
69-
Arguments.of("", "", "repo/myname", ":", null),
70-
Arguments.of("", "", "repo/myname", ":", "latest"),
71-
Arguments.of("registry.foo.com:1234", "/", "my-name", ":", null),
72-
Arguments.of("registry.foo.com:1234", "/", "my-name", ":", "1.0"),
73-
Arguments.of("registry.foo.com", "/", "my-name", ":", "1.0"),
74-
Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", null),
75-
Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0"),
76-
Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", null),
77-
Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0"),
78-
Arguments.of("1.2.3.4:1234", "/", "my-name", ":", null),
79-
Arguments.of("1.2.3.4:1234", "/", "my-name", ":", "1.0"),
80-
Arguments.of("", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
81-
Arguments.of("", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
82-
Arguments.of(
83-
"registry.foo.com:1234",
84-
"/",
85-
"repo-here/my-name",
86-
"@",
87-
"sha256:1234abcd1234abcd1234abcd1234abcd"
88-
),
89-
Arguments.of("registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
90-
Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
91-
Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
92-
Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
93-
Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd")
68+
// Arguments.of("", "", "myname", ":", null),
69+
// Arguments.of("", "", "myname", ":", "latest"),
70+
// Arguments.of("", "", "repo/myname", ":", null),
71+
// Arguments.of("", "", "repo/myname", ":", "latest"),
72+
// Arguments.of("registry.foo.com:1234", "/", "my-name", ":", null),
73+
// Arguments.of("registry.foo.com:1234", "/", "my-name", ":", "1.0"),
74+
// Arguments.of("registry.foo.com", "/", "my-name", ":", "1.0"),
75+
// Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", null),
76+
// Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0"),
77+
// Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", null),
78+
// Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0"),
79+
// Arguments.of("1.2.3.4:1234", "/", "my-name", ":", null),
80+
// Arguments.of("1.2.3.4:1234", "/", "my-name", ":", "1.0"),
81+
// Arguments.of("", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
82+
// Arguments.of("", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
83+
// Arguments.of(
84+
// "registry.foo.com:1234",
85+
// "/",
86+
// "repo-here/my-name",
87+
// "@",
88+
// "sha256:1234abcd1234abcd1234abcd1234abcd"
89+
// ),
90+
// Arguments.of("registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
91+
// Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
92+
// Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
93+
// Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
94+
// Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
95+
Arguments.of("1.2.3.4:1234", "/", "my-name", ":", "my-tag@sha256:1234abcd1234abcd1234abcd1234abcd")
9496
);
9597
}
9698

0 commit comments

Comments
 (0)