| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -65,7 +65,7 @@ public class DockerClientConfig implements Serializable { | |||
| 65 | 65 | ||
| 66 | 66 | private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties"; | |
| 67 | 67 | ||
| 68 | - private URI uri; | ||
| 68 | + private final URI uri; | ||
| 69 | 69 | ||
| 70 | 70 | private final String username, password, email, serverAddress, dockerCfgPath; | |
| 71 | 71 | ||
@@ -208,10 +208,6 @@ public URI getUri() { | |||
| 208 | 208 | return uri; | |
| 209 | 209 | } | |
| 210 | 210 | ||
| 211 | - public void setUri(URI uri) { | ||
| 212 | - this.uri = uri; | ||
| 213 | - } | ||
| 214 | - | ||
| 215 | 211 | public RemoteApiVersion getVersion() { | |
| 216 | 212 | return version; | |
| 217 | 213 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -153,9 +153,7 @@ public void init(DockerClientConfig dockerClientConfig) { | |||
| 153 | 153 | protocol = "http"; | |
| 154 | 154 | } | |
| 155 | 155 | ||
| 156 | - if(originalUri.getScheme().equals("unix")) { | ||
| 157 | - dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri)); | ||
| 158 | - } else { | ||
| 156 | + if(!originalUri.getScheme().equals("unix")) { | ||
| 159 | 157 | configureProxy(clientConfig, protocol); | |
| 160 | 158 | } | |
| 161 | 159 | ||
@@ -181,9 +179,16 @@ public void init(DockerClientConfig dockerClientConfig) { | |||
| 181 | 179 | ||
| 182 | 180 | client = clientBuilder.build(); | |
| 183 | 181 | ||
| 184 | - baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart()); | ||
| 182 | + baseResource = client.target(sanitizeUrl(dockerClientConfig.getUri())).path(dockerClientConfig.getVersion().asWebPathPart()); | ||
| 185 | 183 | } | |
| 186 | 184 | ||
| 185 | + private URI sanitizeUrl(URI originalUri) { | ||
| 186 | + if (originalUri.getScheme().equals("unix")) { | ||
| 187 | + return UnixConnectionSocketFactory.sanitizeUri(originalUri); | ||
| 188 | + } | ||
| 189 | + return originalUri; | ||
| 190 | + } | ||
| 191 | + | ||
| 187 | 192 | private void configureProxy(ClientConfig clientConfig, String protocol) { | |
| 188 | 193 | ||
| 189 | 194 | List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getUri()); | |
| Back | FazBrowse Home | New Git URL |
0 commit comments