Look for .dockercfg in user.home instead of DOCKER_CONFIG

i11 · i11 · commit f7148c2348cd · 2017-12-05T15:03:06.000+01:00
diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -238,7 +238,7 @@ public String getDockerConfigPath() {
     public DockerConfigFile getDockerConfig() {
         if (dockerConfig == null) {
             try {
-                dockerConfig = DockerConfigFile.loadConfig(new File(getDockerConfigPath()));
+                dockerConfig = DockerConfigFile.loadConfig(new File(System.getProperty("user.home")), new File(getDockerConfigPath()));
             } catch (IOException e) {
                 throw new DockerClientException("Failed to parse docker configuration file", e);
             }
diff --git a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -112,13 +112,13 @@ public String toString() {
         return "DockerConfigFile [auths=" + auths + "]";
     }
 
-    public static DockerConfigFile loadConfig(File dockerConfigPath) throws IOException {
+    public static DockerConfigFile loadConfig(File userHome, File dockerConfigPath) throws IOException {
         //parse new docker config file format
         DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath);
 
         //parse old auth config file format
         if (dockerConfig == null) {
-            dockerConfig = loadLegacyConfig(dockerConfigPath);
+            dockerConfig = loadLegacyConfig(userHome);
         }
 
         //otherwise create default config
@@ -150,8 +150,8 @@ private static DockerConfigFile loadCurrentConfig(File dockerConfigPath) throws
         }
     }
 
-    private static DockerConfigFile loadLegacyConfig(File dockerConfigPath) throws IOException {
-        File dockerLegacyCfgFile = new File(dockerConfigPath, File.separator + DOCKER_LEGACY_CFG);
+    private static DockerConfigFile loadLegacyConfig(File userHome) throws IOException {
+        File dockerLegacyCfgFile = new File(userHome, DOCKER_LEGACY_CFG);
 
         if (!dockerLegacyCfgFile.exists() || !dockerLegacyCfgFile.isFile()) {
             return null;
diff --git a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -208,6 +208,7 @@ public void withDockerTlsVerify() throws Exception {
     @Test
     public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException {
         File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v1").toURI());
+        System.setProperty("user.home", cfgFile.getAbsolutePath());
         DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create(
             "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword",
             "registryEmail", null);
diff --git a/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -156,7 +156,7 @@ public void nonExistent() throws IOException {
     }
 
     private DockerConfigFile runTest(String testFileName) throws IOException {
-        return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName));
+        return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName), new File(FILESROOT, testFileName));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public String getDockerConfigPath() {`
`238`	`238`	`public DockerConfigFile getDockerConfig() {`
`239`	`239`	`if (dockerConfig == null) {`
`240`	`240`	`try {`
`241`		`- dockerConfig = DockerConfigFile.loadConfig(new File(getDockerConfigPath()));`
	`241`	`+ dockerConfig = DockerConfigFile.loadConfig(new File(System.getProperty("user.home")), new File(getDockerConfigPath()));`
`242`	`242`	`} catch (IOException e) {`
`243`	`243`	`throw new DockerClientException("Failed to parse docker configuration file", e);`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,13 +112,13 @@ public String toString() {`
`112`	`112`	`return "DockerConfigFile [auths=" + auths + "]";`
`113`	`113`	`}`
`114`	`114`
`115`		`- public static DockerConfigFile loadConfig(File dockerConfigPath) throws IOException {`
	`115`	`+ public static DockerConfigFile loadConfig(File userHome, File dockerConfigPath) throws IOException {`
`116`	`116`	`//parse new docker config file format`
`117`	`117`	`DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath);`
`118`	`118`
`119`	`119`	`//parse old auth config file format`
`120`	`120`	`if (dockerConfig == null) {`
`121`		`- dockerConfig = loadLegacyConfig(dockerConfigPath);`
	`121`	`+ dockerConfig = loadLegacyConfig(userHome);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`//otherwise create default config`
`@@ -150,8 +150,8 @@ private static DockerConfigFile loadCurrentConfig(File dockerConfigPath) throws`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- private static DockerConfigFile loadLegacyConfig(File dockerConfigPath) throws IOException {`
`154`		`- File dockerLegacyCfgFile = new File(dockerConfigPath, File.separator + DOCKER_LEGACY_CFG);`
	`153`	`+ private static DockerConfigFile loadLegacyConfig(File userHome) throws IOException {`
	`154`	`+ File dockerLegacyCfgFile = new File(userHome, DOCKER_LEGACY_CFG);`
`155`	`155`
`156`	`156`	`if (!dockerLegacyCfgFile.exists() \|\| !dockerLegacyCfgFile.isFile()) {`
`157`	`157`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public void nonExistent() throws IOException {`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`private DockerConfigFile runTest(String testFileName) throws IOException {`
`159`		`- return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName));`
	`159`	`+ return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName), new File(FILESROOT, testFileName));`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`}`