-
Notifications
You must be signed in to change notification settings - Fork 85
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.
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
SDK-339: Fix auto Docker setup in Sdk #297
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wikumChamith
requested changes
Oct 3, 2024
@@ -62,7 +64,9 @@ public void executeTask() throws MojoExecutionException { | |||
} | |||
|
|||
private boolean noMySqlImage(DockerClient docker) { | |||
List<Image> mysql = docker.listImagesCmd().withImageNameFilter(MYSQL_8_4_1).exec(); | |||
ListImagesCmd listImagesCmd = docker.listImagesCmd(); | |||
listImagesCmd.getFilters().put("reference", Arrays.asList(MYSQL_8_4_1)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
listImagesCmd.getFilters().put("reference", Arrays.asList(MYSQL_8_4_1)); | |
listImagesCmd.getFilters().put("reference", Collections.singletonList(MYSQL_8_4_1)); | |
List<Image> mysql = docker.listImagesCmd().withImageNameFilter(MYSQL_8_4_1).exec(); | ||
ListImagesCmd listImagesCmd = docker.listImagesCmd(); | ||
listImagesCmd.getFilters().put("reference", Arrays.asList(MYSQL_8_4_1)); | ||
List<Image> mysql = listImagesCmd.exec(); | ||
return mysql.size() == 0; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
return mysql.size() == 0; | |
return mysql.isEmpty(); |
wikumChamith
approved these changes
Oct 4, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of what I changed
@ibacher , @wikumChamith .Lost the previous pr i raised on this topic while doing a rebase.So raised a new pr and will update changes accordingly.
When setting up openmrs sdk by running mvn org.openmrs.maven.plugins:openmrs-sdk-maven-plugin:5.14.0-SNAPSHOT:setup i get a bunch of errors.
The first one is protocol unsupported error → This is because we use http instead of tcp to talk to docker daemon
Once the protocol error is tackeled we get the mysql image not found error ->The withImageFilterCommand doesn't seem to work. Reference docker-java/docker-java#1516
Openmrs Talk Link - OpenMRS SDK installation_BUILD FAILURE_Failed to setup server
Issue I worked on
https://openmrs.atlassian.net/browse/SDK-339
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amend
I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amend
I ran
mvn clean install
right before creating this pull request andadded all formatting changes to my commit.
No? -> execute the above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master