Skip to content
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

Accept image names with library/ prefix as a valid substitute #6174

Merged
merged 11 commits into from
Dec 14, 2022
Merged

Accept image names with library/ prefix as a valid substitute #6174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9f694e1
Accept image names with `library/` prefix as a valid substitute
eddumelendez Nov 14, 2022
5117c55
Use `library/` as part of JDBC Container Providers
eddumelendez Nov 14, 2022
7b01bf3
fix
eddumelendez Nov 15, 2022
9fff180
Revert "Use `library/` as part of JDBC Container Providers"
eddumelendez Nov 16, 2022
65cf233
Revert "Accept image names with `library/` prefix as a valid substitute"
eddumelendez Nov 16, 2022
9c803a3
add prefix to alpine
eddumelendez Nov 16, 2022
6a008ef
Improve logic
eddumelendez Nov 17, 2022
3daf95d
Merge branch 'main' into docker_official_images
eddumelendez Dec 2, 2022
2fef0b0
move logic to isCompatibleWith
eddumelendez Dec 3, 2022
6d240ba
Update core/src/main/java/org/testcontainers/DockerClientFactory.java
eddumelendez Dec 13, 2022
e0807e7
Fix comment
eddumelendez Dec 13, 2022
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
13 changes: 11 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 @@ -26,6 +26,8 @@ public final class DockerImageName {

private static final Pattern REPO_NAME = Pattern.compile(REPO_NAME_PART + "(/" + REPO_NAME_PART + ")*");

private static final String LIBRARY_PREFIX = "library/";

private final String rawName;

@With
Expand Down Expand Up @@ -231,8 +233,15 @@ public DockerImageName asCompatibleSubstituteFor(DockerImageName otherImageName)
* @return whether this image has declared compatibility.
*/
public boolean isCompatibleWith(DockerImageName other) {
// is this image already the same or equivalent?
if (other.equals(this)) {
// Make sure we always compare against a version of the image name containing the LIBRARY_PREFIX
String finalImageName;
if (this.repository.startsWith(LIBRARY_PREFIX)) {
eddumelendez marked this conversation as resolved.
Show resolved Hide resolved
finalImageName = this.repository;
} else {
finalImageName = LIBRARY_PREFIX + this.repository;
}
DockerImageName imageWithLibraryPrefix = DockerImageName.parse(finalImageName);
if (other.equals(this) || imageWithLibraryPrefix.equals(this)) {
Copy link

Choose a reason for hiding this comment

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

(Minor) More cleaner

if (Objects.equals(other, this) || Objects.equals(imageWithLibraryPrefix, this)) {
   ....
}

Copy link
Member

Choose a reason for hiding this comment

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

I don't think this changes the degree of "cleanness", but a question of taste (beside the null-safety of Objects.equals() in general). Either style should be fine in this case.

return true;
}

Expand Down
6 changes: 6 additions & 0 deletions core/src/test/java/org/testcontainers/utility/DockerImageNameCompatibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ public void testAssertMethodAcceptsCompatible() {
subject.assertCompatibleWith(DockerImageName.parse("bar"));
}

@Test
public void testAssertMethodAcceptsCompatibleLibraryPrefix() {
eddumelendez marked this conversation as resolved.
Show resolved Hide resolved
DockerImageName subject = DockerImageName.parse("library/foo");
subject.assertCompatibleWith(DockerImageName.parse("foo"));
}

@Test
public void testAssertMethodRejectsIncompatible() {
DockerImageName subject = DockerImageName.parse("foo");
Expand Down