docker-java
diff --git a/‎docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
Lines changed: 7 additions & 8 deletions b/‎docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
Lines changed: 7 additions & 8 deletions
diff --git a/‎docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
Lines changed: 10 additions & 9 deletions b/‎docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
Lines changed: 10 additions & 9 deletions
diff --git a/‎docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
Lines changed: 1 addition & 2 deletions b/‎docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
Lines changed: 1 addition & 2 deletions
diff --git a/‎docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem b/‎docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem
diff --git a/‎docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem b/‎docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem
diff --git a/‎docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem b/‎docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem
@@ -446,21 +446,20 @@ private void applyContextConfiguration(final String context) {
                 Optional.ofNullable(context)
                     .flatMap(ctx -> DockerContextMetaFile.resolveContextMetaFile(DockerClientConfig.getDefaultObjectMapper(),
                             new File(this.dockerConfig), ctx));
+            final Optional<File> dockerContextTLSFile =
+                Optional.ofNullable(context)
+                    .flatMap(ctx -> DockerContextMetaFile.resolveContextTLSFile(new File(this.dockerConfig), ctx));
 
             if (dockerContextMetaFile.isPresent()) {
                 final Optional<DockerContextMetaFile.Endpoints.Docker> dockerEndpoint =
                     dockerContextMetaFile.map(metaFile -> metaFile.endpoints).map(endpoint -> endpoint.docker);
                 if (this.dockerHost == null) {
                     this.dockerHost = dockerEndpoint.map(endpoint -> endpoint.host).map(URI::create).orElse(null);
                 }
-                if (this.dockerCertPath == null) {
-                    this.dockerCertPath = dockerContextMetaFile.map(metaFile -> metaFile.storage)
-                        .map(storage -> storage.tlsPath)
-                        .filter(file -> new File(file).exists()).orElse(null);
-                    if (this.dockerCertPath != null) {
-                        this.dockerTlsVerify = dockerEndpoint.map(endpoint -> !endpoint.skipTLSVerify).orElse(true);
-                    }
-                }
+            }
+            if (dockerContextTLSFile.isPresent() && this.dockerCertPath == null) {
+                this.dockerCertPath = dockerContextTLSFile.get().getAbsolutePath();
+                this.dockerTlsVerify = true;
             }
         }
 
 
@@ -18,8 +18,6 @@ public class DockerContextMetaFile {
     @JsonProperty("Endpoints")
     Endpoints endpoints;
 
-    @JsonProperty("Storage")
-    Storage storage;
 
     public static class Endpoints {
         @JsonProperty("docker")
@@ -34,13 +32,6 @@ public static class Docker {
         }
     }
 
-    public static class Storage {
-
-        @JsonProperty("TLSPath")
-        String tlsPath;
-        @JsonProperty("MetadataPath")
-        String metadataPath;
-    }
 
     public static Optional<DockerContextMetaFile> resolveContextMetaFile(ObjectMapper objectMapper, File dockerConfigPath, String context) {
         final File path = dockerConfigPath.toPath()
@@ -52,6 +43,16 @@ public static Optional<DockerContextMetaFile> resolveContextMetaFile(ObjectMappe
         return Optional.ofNullable(loadContextMetaFile(objectMapper, path));
     }
 
+    public static Optional<File> resolveContextTLSFile(File dockerConfigPath, String context) {
+        final File path = dockerConfigPath.toPath()
+            .resolve("contexts")
+            .resolve("tls")
+            .resolve(metaHashFunction.hashString(context, StandardCharsets.UTF_8).toString())
+            .resolve("docker")
+            .toFile();
+        return  Optional.ofNullable(path).filter(File::exists);
+    }
+
     public static DockerContextMetaFile loadContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) {
         try {
             return parseContextMetaFile(objectMapper, dockerContextMetaFile);
 
@@ -129,8 +129,7 @@ public void dockerContextWithDockerHostAndTLS() {
 
         assertEquals(URI.create("tcp://remote:2376"), config.getDockerHost());
         assertTrue("SSL config is set", config.getSSLConfig() instanceof LocalDirectorySSLConfig);
-        assertEquals("target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist",
-            ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath());
+        assertTrue("SSL directory is set", ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath().endsWith("dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker"));
     }
 
     @Test
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,7 @@ public void dockerContextWithDockerHostAndTLS() {`
`129`	`129`
`130`	`130`	`assertEquals(URI.create("tcp://remote:2376"), config.getDockerHost());`
`131`	`131`	`assertTrue("SSL config is set", config.getSSLConfig() instanceof LocalDirectorySSLConfig);`
`132`		`- assertEquals("target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist",`
`133`		`- ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath());`
	`132`	`+ assertTrue("SSL directory is set", ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath().endsWith("dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker"));`
`134`	`133`	`}`
`135`	`134`
`136`	`135`	`@Test`