Merge pull request #2443 from docker/4.1.0-release

4.1.0 release

Author: chris-crone

Dockerfile

@@ -1,4 +1,6 @@
-FROM python:2.7
+ARG PYTHON_VERSION=2.7
+
+FROM python:${PYTHON_VERSION}
 
 RUN mkdir /src
 WORKDIR /src

Dockerfile-docs

@@ -1,4 +1,6 @@
-FROM python:3.5
+ARG PYTHON_VERSION=3.7
+
+FROM python:${PYTHON_VERSION}
 
 ARG uid=1000
 ARG gid=1000

Dockerfile-py3

@@ -1,4 +1,6 @@
-FROM python:3.6
+ARG PYTHON_VERSION=3.7
+
+FROM python:${PYTHON_VERSION}
 
 RUN mkdir /src
 WORKDIR /src

Jenkinsfile

@@ -25,7 +25,7 @@ def buildImages = { ->
       imageNamePy3 = "${imageNameBase}:py3-${gitCommit()}"
 
       buildImage(imageNamePy2, "-f tests/Dockerfile --build-arg PYTHON_VERSION=2.7 .", "py2.7")
-      buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.6 .", "py3.6")
+      buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.7 .", "py3.7")
     }
   }
 }
@@ -46,12 +46,14 @@ def getDockerVersions = { ->
 
 def getAPIVersion = { engineVersion ->
   def versionMap = [
-    '17.06': '1.30', '17.12': '1.35', '18.02': '1.36', '18.03': '1.37',
-    '18.06': '1.38', '18.09': '1.39'
+    '17.06': '1.30',
+    '18.03': '1.37',
+    '18.09': '1.39',
+    '19.03': '1.40'
   ]
   def result = versionMap[engineVersion.substring(0, 5)]
   if (!result) {
-    return '1.39'
+    return '1.40'
   }
   return result
 }

Makefile

@@ -8,11 +8,11 @@ clean:
 
 .PHONY: build
 build:
-	docker build -t docker-sdk-python -f tests/Dockerfile --build-arg PYTHON_VERSION=2.7 .
+	docker build -t docker-sdk-python -f tests/Dockerfile --build-arg PYTHON_VERSION=2.7 --build-arg APT_MIRROR .
 
 .PHONY: build-py3
 build-py3:
-	docker build -t docker-sdk-python3 -f tests/Dockerfile .
+	docker build -t docker-sdk-python3 -f tests/Dockerfile --build-arg APT_MIRROR .
 
 .PHONY: build-docs
 build-docs:

docker/api/build.py

@@ -308,7 +308,8 @@ def _set_auth_headers(self, headers):
             auth_data = self._auth_configs.get_all_credentials()
 
             # See https://github.com/docker/docker-py/issues/1683
-            if auth.INDEX_URL not in auth_data and auth.INDEX_URL in auth_data:
+            if (auth.INDEX_URL not in auth_data and
+                    auth.INDEX_NAME in auth_data):
                 auth_data[auth.INDEX_URL] = auth_data.get(auth.INDEX_NAME, {})
 
             log.debug(

docker/api/container.py

@@ -174,7 +174,8 @@ def containers(self, quiet=False, all=False, trunc=False, latest=False,
                 - `exited` (int): Only containers with specified exit code
                 - `status` (str): One of ``restarting``, ``running``,
                     ``paused``, ``exited``
-                - `label` (str): format either ``"key"`` or ``"key=value"``
+                - `label` (str|list): format either ``"key"``, ``"key=value"``
+                    or a list of such.
                 - `id` (str): The id of the container.
                 - `name` (str): The name of the container.
                 - `ancestor` (str): Filter by container ancestor. Format of
@@ -502,6 +503,7 @@ def create_host_config(self, *args, **kwargs):
                 bytes) or a string with a units identification char
                 (``100000b``, ``1000k``, ``128m``, ``1g``). If a string is
                 specified without a units character, bytes are assumed as an
+            mem_reservation (int or str): Memory soft limit.
             mem_swappiness (int): Tune a container's memory swappiness
                 behavior. Accepts number between 0 and 100.
             memswap_limit (str or int): Maximum amount of memory + swap a

docker/api/image.py

@@ -70,7 +70,8 @@ def images(self, name=None, quiet=False, all=False, filters=None):
             filters (dict): Filters to be processed on the image list.
                 Available filters:
                 - ``dangling`` (bool)
-                - ``label`` (str): format either ``key`` or ``key=value``
+                - `label` (str|list): format either ``"key"``, ``"key=value"``
+                    or a list of such.
 
         Returns:
             (dict or list): A list if ``quiet=True``, otherwise a dict.

docker/api/network.py

@@ -7,15 +7,16 @@
 class NetworkApiMixin(object):
     def networks(self, names=None, ids=None, filters=None):
         """
-        List networks. Similar to the ``docker networks ls`` command.
+        List networks. Similar to the ``docker network ls`` command.
 
         Args:
             names (:py:class:`list`): List of names to filter by
             ids (:py:class:`list`): List of ids to filter by
             filters (dict): Filters to be processed on the network list.
                 Available filters:
                 - ``driver=[<driver-name>]`` Matches a network's driver.
-                - ``label=[<key>]`` or ``label=[<key>=<value>]``.
+                - ``label=[<key>]``, ``label=[<key>=<value>]`` or a list of
+                    such.
                 - ``type=["custom"|"builtin"]`` Filters networks by type.
 
         Returns:

docker/api/service.py

@@ -135,8 +135,9 @@ def create_service(
                 of the service. Default: ``None``
             rollback_config (RollbackConfig): Specification for the rollback
                 strategy of the service. Default: ``None``
-            networks (:py:class:`list`): List of network names or IDs to attach
-                the service to. Default: ``None``.
+            networks (:py:class:`list`): List of network names or IDs or
+                :py:class:`~docker.types.NetworkAttachmentConfig` to attach the
+                service to. Default: ``None``.
             endpoint_spec (EndpointSpec): Properties that can be configured to
                 access and load balance a service. Default: ``None``.
 
@@ -383,8 +384,9 @@ def update_service(self, service, version, task_template=None, name=None,
                 of the service. Default: ``None``.
             rollback_config (RollbackConfig): Specification for the rollback
                 strategy of the service. Default: ``None``
-            networks (:py:class:`list`): List of network names or IDs to attach
-                the service to. Default: ``None``.
+            networks (:py:class:`list`): List of network names or IDs or
+                :py:class:`~docker.types.NetworkAttachmentConfig` to attach the
+                service to. Default: ``None``.
             endpoint_spec (EndpointSpec): Properties that can be configured to
                 access and load balance a service. Default: ``None``.
             fetch_current_spec (boolean): Use the undefined settings from the