Merge branch 'master' into exec_create_user

Author: stevenewey

Dockerfile

@@ -1,5 +1,5 @@
 FROM python:2.7
-MAINTAINER Joffrey F <joffrey@dotcloud.com>
+MAINTAINER Joffrey F <joffrey@docker.com>
 ADD . /home/docker-py
 WORKDIR /home/docker-py
 RUN pip install -r test-requirements.txt

Dockerfile-py3

@@ -0,0 +1,6 @@
+FROM python:3.4
+MAINTAINER Joffrey F <[email protected]>
+ADD . /home/docker-py
+WORKDIR /home/docker-py
+RUN pip install -r test-requirements.txt
+RUN pip install .

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all build test integration-test unit-test
+.PHONY: all build test integration-test unit-test build-py3 unit-test-py3 integration-test-py3
 
 HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp
 
@@ -7,10 +7,19 @@ all: test
 build:
 	docker build -t docker-py .
 
-test: unit-test integration-test
+build-py3:
+	docker build -t docker-py3 -f Dockerfile-py3 .
+
+test: unit-test integration-test unit-test-py3 integration-test-py3
 
 unit-test: build
 	docker run docker-py python tests/test.py
 
+unit-test-py3: build-py3
+	docker run docker-py3 python tests/test.py
+
 integration-test: build
 	docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py
+
+integration-test-py3: build-py3
+	docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 python tests/integration_test.py

docker/auth/__init__.py

@@ -1,4 +1,5 @@
 from .auth import (
+    INDEX_NAME,
     INDEX_URL,
     encode_header,
     load_config,

docker/auth/auth.py

@@ -16,38 +16,34 @@
 import fileinput
 import json
 import os
+import warnings
 
 import six
 
-from ..utils import utils
+from .. import constants
 from .. import errors
 
-INDEX_URL = 'https://index.docker.io/v1/'
+INDEX_NAME = 'index.docker.io'
+INDEX_URL = 'https://{0}/v1/'.format(INDEX_NAME)
 DOCKER_CONFIG_FILENAME = os.path.join('.docker', 'config.json')
 LEGACY_DOCKER_CONFIG_FILENAME = '.dockercfg'
 
 
-def expand_registry_url(hostname, insecure=False):
-    if hostname.startswith('http:') or hostname.startswith('https:'):
-        return hostname
-    if utils.ping_registry('https://' + hostname):
-        return 'https://' + hostname
-    elif insecure:
-        return 'http://' + hostname
-    else:
-        raise errors.DockerException(
-            "HTTPS endpoint unresponsive and insecure mode isn't enabled."
+def resolve_repository_name(repo_name, insecure=False):
+    if insecure:
+        warnings.warn(
+            constants.INSECURE_REGISTRY_DEPRECATION_WARNING.format(
+                'resolve_repository_name()'
+            ), DeprecationWarning
         )
 
-
-def resolve_repository_name(repo_name, insecure=False):
     if '://' in repo_name:
         raise errors.InvalidRepository(
             'Repository name cannot contain a scheme ({0})'.format(repo_name))
     parts = repo_name.split('/', 1)
     if '.' not in parts[0] and ':' not in parts[0] and parts[0] != 'localhost':
         # This is a docker index repo (ex: foo/bar or ubuntu)
-        return INDEX_URL, repo_name
+        return INDEX_NAME, repo_name
     if len(parts) < 2:
         raise errors.InvalidRepository(
             'Invalid repository name ({0})'.format(repo_name))
@@ -57,7 +53,7 @@ def resolve_repository_name(repo_name, insecure=False):
             'Invalid repository name, try "{0}" instead'.format(parts[1])
         )
 
-    return expand_registry_url(parts[0], insecure), parts[1]
+    return parts[0], parts[1]
 
 
 def resolve_authconfig(authconfig, registry=None):
@@ -68,7 +64,7 @@ def resolve_authconfig(authconfig, registry=None):
     Returns None if no match was found.
     """
     # Default to the public index server
-    registry = convert_to_hostname(registry) if registry else INDEX_URL
+    registry = convert_to_hostname(registry) if registry else INDEX_NAME
 
     if registry in authconfig:
         return authconfig[registry]
@@ -102,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
@@ -185,7 +175,7 @@ def load_config(config_path=None):
                 'Invalid or empty configuration file!')
 
         username, password = decode_auth(data[0])
-        conf[INDEX_URL] = {
+        conf[INDEX_NAME] = {
             'username': username,
             'password': password,
             'email': data[1],