summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-07-20 13:56:29 -0700
committerJoffrey F <joffrey@docker.com>2015-07-20 13:56:29 -0700
commit7430eb8e659fe2fe605a00cc3ff72ad053393138 (patch)
treec58036a7f8371d67aeaab0469c59c414172da336
parent933ee526baaac006f9a16620a1fcea6c0505f883 (diff)
parentebcfab0a4c1430846de1b26a114570e4eb0d6a1a (diff)
downloaddocker-py-7430eb8e659fe2fe605a00cc3ff72ad053393138.tar.gz
Merge branch 'fix-build-auth' of https://github.com/moutten/docker-py into moutten-fix-build-auth
-rw-r--r--docker/auth/auth.py6
-rw-r--r--docker/client.py2
2 files changed, 1 insertions, 7 deletions
diff --git a/docker/auth/auth.py b/docker/auth/auth.py
index 56c42ec..4af741e 100644
--- a/docker/auth/auth.py
+++ b/docker/auth/auth.py
@@ -98,12 +98,6 @@ def encode_header(auth):
return base64.b64encode(auth_json)
-def encode_full_header(auth):
- """ Returns the given auth block encoded for the X-Registry-Config header.
- """
- return encode_header({'configs': auth})
-
-
def parse_auth(entries):
"""
Parses authentication entries
diff --git a/docker/client.py b/docker/client.py
index 9084689..7fe72db 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -140,7 +140,7 @@ class Client(clientbase.ClientBase):
if self._auth_configs:
if headers is None:
headers = {}
- headers['X-Registry-Config'] = auth.encode_full_header(
+ headers['X-Registry-Config'] = auth.encode_header(
self._auth_configs
)