From c484e8b7fb96d54371fbe160fd31d8290a5f75c4 Mon Sep 17 00:00:00 2001 From: Dennis Keitzel Date: Wed, 11 Jul 2018 16:32:57 +0200 Subject: [PATCH] Provide empty client config if path to config is null --- .../github/dockerjava/core/DefaultDockerClientConfig.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 8517d89a9..a6854af2d 100644 --- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -238,7 +238,11 @@ public String getDockerConfigPath() { public DockerConfigFile getDockerConfig() { if (dockerConfig == null) { try { - dockerConfig = DockerConfigFile.loadConfig(new File(getDockerConfigPath())); + if (getDockerConfigPath() != null) { + dockerConfig = DockerConfigFile.loadConfig(new File(getDockerConfigPath())); + } else { + dockerConfig = new DockerConfigFile(); + } } catch (IOException e) { throw new DockerClientException("Failed to parse docker configuration file", e); }