Skip to content

Input configuration should not be altered as it breaks unix socket support #457

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
marcuslinke merged 2 commits into from
Feb 12, 2016
Merged

Input configuration should not be altered as it breaks unix socket support #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8326332
Issue-456 input configuration should not be altered as it breaks unix…
mbaechler Feb 11, 2016
8198aca
fixup! Issue-456 input configuration should not be altered as it brea…
mbaechler Feb 12, 2016
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
6 changes: 1 addition & 5 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 @@ -65,7 +65,7 @@ public class DockerClientConfig implements Serializable {

private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties";

private URI uri;
private final URI uri;

private final String username, password, email, serverAddress, dockerCfgPath;

Expand Down Expand Up @@ -208,10 +208,6 @@ public URI getUri() {
return uri;
}

public void setUri(URI uri) {
this.uri = uri;
}

public RemoteApiVersion getVersion() {
return version;
}
Expand Down
13 changes: 9 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 @@ -153,9 +153,7 @@ public void init(DockerClientConfig dockerClientConfig) {
protocol = "http";
}

if(originalUri.getScheme().equals("unix")) {
dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
} else {
if(!originalUri.getScheme().equals("unix")) {
configureProxy(clientConfig, protocol);
}

Expand All @@ -181,9 +179,16 @@ public void init(DockerClientConfig dockerClientConfig) {

client = clientBuilder.build();

baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
baseResource = client.target(sanitizeUrl(dockerClientConfig.getUri())).path(dockerClientConfig.getVersion().asWebPathPart());
}

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

private void configureProxy(ClientConfig clientConfig, String protocol) {

List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getUri());
Expand Down