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.

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

DockerClient.version() falls back to trying '--version' #213

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,12 @@ public void rm(@Nonnull EnvVars launchEnv, @Nonnull String containerId) throws I
LaunchResult result = launch(new EnvVars(), true, "-v");

Choose a reason for hiding this comment

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

Why just not use the --version option? It is supported by both docker (see https://docs.docker.com/engine/reference/commandline/cli/) and podman.

Suggested change
LaunchResult result = launch(new EnvVars(), true, "-v");
LaunchResult result = launch(new EnvVars(), true, "--version");

This way, there is no need to add another if-statement if the -v option fails.

if (result.getStatus() == 0) {
return parseVersionNumber(result.getOut());
} else {
return null;
}
result = launch(new EnvVars(), true, "--version");
if (result.getStatus() == 0) {
return parseVersionNumber(result.getOut());
}
return null;
}

private static final Pattern pattern = Pattern.compile("^(\\D+)(\\d+)\\.(\\d+)\\.(\\d+)(.*)");
Expand Down