Skip to content

Issue-456 input configuration should not be altered as it breaks unix… #465

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

Merged
KostyaSha merged 1 commit into from
Feb 14, 2016
Merged

Issue-456 input configuration should not be altered as it breaks unix… #465

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: 2 additions & 6 deletions src/main/java/com/github/dockerjava/core/DockerClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ public class DockerClientConfig implements Serializable {
CONFIG_KEYS.add(REGISTRY_URL);
}

private URI dockerHost;
private final URI dockerHost;

private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, dockerCertPath;

private boolean dockerTlsVerify;
private final boolean dockerTlsVerify;

private final RemoteApiVersion apiVersion;

Expand Down Expand Up @@ -238,10 +238,6 @@ public URI getDockerHost() {
return dockerHost;
}

public void setDockerHost(URI dockerHost) {
this.dockerHost = dockerHost;
}

public RemoteApiVersion getApiVersion() {
return apiVersion;
}
Expand Down
15 changes: 11 additions & 4 deletions src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,14 @@ public void init(DockerClientConfig dockerClientConfig) {
protocol = "http";
}

if (originalUri.getScheme().equals("unix")) {
dockerClientConfig.setDockerHost(UnixConnectionSocketFactory.sanitizeUri(originalUri));
} else {
if (!originalUri.getScheme().equals("unix")) {

try {
originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}

configureProxy(clientConfig, protocol);
}

Expand Down Expand Up @@ -209,7 +209,14 @@ public void init(DockerClientConfig dockerClientConfig) {

client = clientBuilder.build();

baseResource = client.target(originalUri.toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
baseResource = client.target(sanitizeUrl(originalUri).toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
}

private URI sanitizeUrl(URI originalUri) {
Copy link
Member

@KostyaSha KostyaSha Feb 13, 2016

Choose a reason for hiding this comment

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

Please provide some javadoc to get idea why it critical.

Copy link
Contributor Author

@marcuslinke marcuslinke Feb 13, 2016

Choose a reason for hiding this comment

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

Sorry, don't know what you mean.

Copy link
Member

@KostyaSha KostyaSha Feb 13, 2016

Choose a reason for hiding this comment

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

well, ok, ignore.

if (originalUri.getScheme().equals("unix")) {
return UnixConnectionSocketFactory.sanitizeUri(originalUri);
}
return originalUri;
}

private void configureProxy(ClientConfig clientConfig, String protocol) {
Expand Down