diff options
| author | Joffrey F <joffrey@docker.com> | 2015-09-16 14:09:50 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-10-08 13:59:39 -0700 |
| commit | 4845dae0c02516f98f43f301a654cad7efd04fa4 (patch) | |
| tree | 80258380f0437b1af8b3dff2a4fbe13c3d8ff627 /docker/utils | |
| parent | eb869c0bd33879c03287c8b9b762e1f6113e7d7f (diff) | |
| download | docker-py-4845dae0c02516f98f43f301a654cad7efd04fa4.tar.gz | |
put/get archive implementation
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/utils')
| -rw-r--r-- | docker/utils/__init__.py | 2 | ||||
| -rw-r--r-- | docker/utils/utils.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/docker/utils/__init__.py b/docker/utils/__init__.py index fd0ef5c..92e03e9 100644 --- a/docker/utils/__init__.py +++ b/docker/utils/__init__.py @@ -3,7 +3,7 @@ from .utils import ( mkbuildcontext, tar, exclude_paths, parse_repository_tag, parse_host, kwargs_from_env, convert_filters, create_host_config, create_container_config, parse_bytes, ping_registry, parse_env_file, - version_lt, version_gte + version_lt, version_gte, decode_json_header ) # flake8: noqa from .types import Ulimit, LogConfig # flake8: noqa diff --git a/docker/utils/utils.py b/docker/utils/utils.py index 1fce137..89837b7 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import base64 import io import os import os.path @@ -66,6 +67,13 @@ def mkbuildcontext(dockerfile): return f +def decode_json_header(header): + data = base64.b64decode(header) + if six.PY3: + data = data.decode('utf-8') + return json.loads(data) + + def tar(path, exclude=None, dockerfile=None): f = tempfile.NamedTemporaryFile() t = tarfile.open(mode='w', fileobj=f) |
