Move reload_config func into the APIClient

Also revert an incorrect change in the DaemonApiMixin's login func

Signed-off-by: Erik Johnson <[email protected]>

Author: terminalmage

docker/api/client.py

@@ -433,3 +433,17 @@ def get_adapter(self, url):
     @property
     def api_version(self):
         return self._version
+
+    def reload_config(self, dockercfg_path=None):
+        """
+        Force a reload of the auth configuration
+
+        Args:
+            dockercfg_path (str): Use a custom path for the Docker config file
+                (default ``$HOME/.docker/config.json`` if present,
+                otherwise``$HOME/.dockercfg``)
+
+        Returns:
+            None
+        """
+        self._auth_configs = auth.load_config(dockercfg_path)

docker/api/daemon.py

@@ -123,9 +123,9 @@ def login(self, username, password=None, email=None, registry=None,
         # If dockercfg_path is passed check to see if the config file exists,
         # if so load that config.
         if dockercfg_path and os.path.exists(dockercfg_path):
-            self._auth_configs = self.reload_config(dockercfg_path)
+            self._auth_configs = auth.load_config(dockercfg_path)
         elif not self._auth_configs:
-            self._auth_configs = self.reload_config()
+            self._auth_configs = auth.load_config()
 
         authcfg = auth.resolve_authconfig(self._auth_configs, registry)
         # If we found an existing auth config for this registry and username
@@ -174,17 +174,3 @@ def version(self, api_version=True):
         """
         url = self._url("/version", versioned_api=api_version)
         return self._result(self._get(url), json=True)
-
-    def reload_config(self, dockercfg_path=None):
-        """
-        Forces a reload of the auth configuration
-
-        Args:
-            dockercfg_path (str): Use a custom path for the Docker config file
-                (default ``$HOME/.docker/config.json`` if present,
-                otherwise``$HOME/.dockercfg``)
-
-        Returns:
-            None
-        """
-        self._auth_configs = auth.load_config(dockercfg_path)