Merge branch 'master' into connect-with-mac

Signed-off-by: Hongbin Lu <hongbin034@gmail.com>

Author: Hongbin Lu

.travis.yml

@@ -1,15 +1,22 @@
 sudo: false
 language: python
-python:
-  - "3.5"
-env:
-    - TOX_ENV=py27
-# FIXME: default travis worker does not carry py33 anymore. Can this be configured?
-#    - TOX_ENV=py33
-    - TOX_ENV=py34
-    - TOX_ENV=py35
-    - TOX_ENV=flake8
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.4
+      env: TOXENV=py34
+    - python: 3.5
+      env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
+    - python: 3.7
+      env: TOXENV=py37
+      dist: xenial
+      sudo: true
+    - env: TOXENV=flake8
+
 install:
     - pip install tox
 script:
-    - tox -e $TOX_ENV
+    - tox

Dockerfile-py3

@@ -1,4 +1,4 @@
-FROM python:3.5
+FROM python:3.6
 
 RUN mkdir /src
 WORKDIR /src

Jenkinsfile

@@ -5,9 +5,6 @@ def imageNamePy2
 def imageNamePy3
 def images = [:]
 
-
-def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce", "17.07.0-ce-rc3"]
-
 def buildImage = { name, buildargs, pyTag ->
   img = docker.image(name)
   try {
@@ -28,14 +25,35 @@ def buildImages = { ->
       imageNamePy3 = "${imageNameBase}:py3-${gitCommit()}"
 
       buildImage(imageNamePy2, ".", "py2.7")
-      buildImage(imageNamePy3, "-f Dockerfile-py3 .", "py3.5")
+      buildImage(imageNamePy3, "-f Dockerfile-py3 .", "py3.6")
     }
   }
 }
 
+def getDockerVersions = { ->
+  def dockerVersions = ["17.06.2-ce"]
+  wrappedNode(label: "ubuntu && !zfs") {
+    def result = sh(script: """docker run --rm \\
+        --entrypoint=python \\
+        ${imageNamePy3} \\
+        /src/scripts/versions.py
+      """, returnStdout: true
+    )
+    dockerVersions = dockerVersions + result.trim().tokenize(' ')
+  }
+  return dockerVersions
+}
+
 def getAPIVersion = { engineVersion ->
-  def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30', '17.07': '1.31']
-  return versionMap[engineVersion.substring(0, 5)]
+  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'
+  ]
+  def result = versionMap[engineVersion.substring(0, 5)]
+  if (!result) {
+    return '1.39'
+  }
+  return result
 }
 
 def runTests = { Map settings ->
@@ -60,22 +78,26 @@ def runTests = { Map settings ->
         checkout(scm)
         def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}"
         def testContainerName = "dpy-tests-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}"
+        def testNetwork = "dpy-testnet-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}"
         try {
-          sh """docker run -d --name  ${dindContainerName} -v /tmp --privileged \\
+          sh """docker network create ${testNetwork}"""
+          sh """docker run -d --name  ${dindContainerName} -v /tmp --privileged --network ${testNetwork} \\
             dockerswarm/dind:${dockerVersion} dockerd -H tcp://0.0.0.0:2375
           """
           sh """docker run \\
-            --name ${testContainerName} --volumes-from ${dindContainerName} \\
-            -e 'DOCKER_HOST=tcp://docker:2375' \\
+            --name ${testContainerName} \\
+            -e "DOCKER_HOST=tcp://${dindContainerName}:2375" \\
             -e 'DOCKER_TEST_API_VERSION=${apiVersion}' \\
-            --link=${dindContainerName}:docker \\
+            --network ${testNetwork} \\
+            --volumes-from ${dindContainerName} \\
             ${testImage} \\
-            py.test -v -rxs tests/integration
+            py.test -v -rxs --cov=docker tests/
           """
         } finally {
           sh """
             docker stop ${dindContainerName} ${testContainerName}
             docker rm -vf ${dindContainerName} ${testContainerName}
+            docker network rm ${testNetwork}
           """
         }
       }
@@ -86,6 +108,8 @@ def runTests = { Map settings ->
 
 buildImages()
 
+def dockerVersions = getDockerVersions()
+
 def testMatrix = [failFast: false]
 
 for (imgKey in new ArrayList(images.keySet())) {

MAINTAINERS

@@ -10,13 +10,16 @@
 #
 [Org]
 	[Org."Core maintainers"]
+		people = [
+			"shin-",
+		]
+	[Org.Alumni]
 		people = [
 			"aanand",
 			"bfirsh",
 			"dnephin",
 			"mnowster",
 			"mpetazzoni",
-			"shin-",
 		]
 
 [people]

Makefile

@@ -3,7 +3,7 @@ all: test
 
 .PHONY: clean
 clean:
-	-docker rm -vf dpy-dind
+	-docker rm -f dpy-dind-py2 dpy-dind-py3 dpy-dind-certs dpy-dind-ssl
 	find -name "__pycache__" | xargs rm -rf
 
 .PHONY: build
@@ -27,57 +27,73 @@ test: flake8 unit-test unit-test-py3 integration-dind integration-dind-ssl
 
 .PHONY: unit-test
 unit-test: build
-	docker run --rm docker-sdk-python py.test tests/unit
+	docker run -t --rm docker-sdk-python py.test tests/unit
 
 .PHONY: unit-test-py3
 unit-test-py3: build-py3
-	docker run --rm docker-sdk-python3 py.test tests/unit
+	docker run -t --rm docker-sdk-python3 py.test tests/unit
 
 .PHONY: integration-test
 integration-test: build
-	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python py.test tests/integration/${file}
+	docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python py.test -v tests/integration/${file}
 
 .PHONY: integration-test-py3
 integration-test-py3: build-py3
-	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test tests/integration/${file}
+	docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test tests/integration/${file}
 
-TEST_API_VERSION ?= 1.30
-TEST_ENGINE_VERSION ?= 17.06.0-ce
+TEST_API_VERSION ?= 1.35
+TEST_ENGINE_VERSION ?= 17.12.0-ce
+
+.PHONY: setup-network
+setup-network:
+	docker network inspect dpy-tests || docker network create dpy-tests
 
 .PHONY: integration-dind
-integration-dind: build build-py3
-	docker rm -vf dpy-dind || :
-	docker run -d --name dpy-dind --privileged dockerswarm/dind:${TEST_ENGINE_VERSION} dockerd\
-		-H tcp://0.0.0.0:2375 --experimental
-	docker run --rm --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TEST_API_VERSION=${TEST_API_VERSION}"\
-		--link=dpy-dind:docker docker-sdk-python py.test tests/integration
-	docker run --rm --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TEST_API_VERSION=${TEST_API_VERSION}"\
-		--link=dpy-dind:docker docker-sdk-python3 py.test tests/integration
-	docker rm -vf dpy-dind
+integration-dind: integration-dind-py2 integration-dind-py3
+
+.PHONY: integration-dind-py2
+integration-dind-py2: build setup-network
+	docker rm -vf dpy-dind-py2 || :
+	docker run -d --network dpy-tests --name dpy-dind-py2 --privileged\
+		dockerswarm/dind:${TEST_ENGINE_VERSION} dockerd -H tcp://0.0.0.0:2375 --experimental
+	docker run -t --rm --env="DOCKER_HOST=tcp://dpy-dind-py2:2375" --env="DOCKER_TEST_API_VERSION=${TEST_API_VERSION}"\
+		--network dpy-tests docker-sdk-python py.test tests/integration
+	docker rm -vf dpy-dind-py2
+
+.PHONY: integration-dind-py3
+integration-dind-py3: build-py3 setup-network
+	docker rm -vf dpy-dind-py3 || :
+	docker run -d --network dpy-tests --name dpy-dind-py3 --privileged\
+		dockerswarm/dind:${TEST_ENGINE_VERSION} dockerd -H tcp://0.0.0.0:2375 --experimental
+	docker run -t --rm --env="DOCKER_HOST=tcp://dpy-dind-py3:2375" --env="DOCKER_TEST_API_VERSION=${TEST_API_VERSION}"\
+		--network dpy-tests docker-sdk-python3 py.test tests/integration
+	docker rm -vf dpy-dind-py3
 
 .PHONY: integration-dind-ssl
 integration-dind-ssl: build-dind-certs build build-py3
+	docker rm -vf dpy-dind-certs dpy-dind-ssl || :
 	docker run -d --name dpy-dind-certs dpy-dind-certs
 	docker run -d --env="DOCKER_HOST=tcp://localhost:2375" --env="DOCKER_TLS_VERIFY=1"\
 		--env="DOCKER_CERT_PATH=/certs" --volumes-from dpy-dind-certs --name dpy-dind-ssl\
-		-v /tmp --privileged dockerswarm/dind:${TEST_ENGINE_VERSION} dockerd --tlsverify\
-		--tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem\
+		--network dpy-tests --network-alias docker -v /tmp --privileged\
+		dockerswarm/dind:${TEST_ENGINE_VERSION}\
+		dockerd --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem\
 		--tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 --experimental
-	docker run --rm --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375"\
+	docker run -t --rm --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375"\
 		--env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --env="DOCKER_TEST_API_VERSION=${TEST_API_VERSION}"\
-		--link=dpy-dind-ssl:docker docker-sdk-python py.test tests/integration
-	docker run --rm --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375"\
+		--network dpy-tests docker-sdk-python py.test tests/integration
+	docker run -t --rm --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375"\
 		--env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --env="DOCKER_TEST_API_VERSION=${TEST_API_VERSION}"\
-		--link=dpy-dind-ssl:docker docker-sdk-python3 py.test tests/integration
+		--network dpy-tests docker-sdk-python3 py.test tests/integration
 	docker rm -vf dpy-dind-ssl dpy-dind-certs
 
 .PHONY: flake8
 flake8: build
-	docker run --rm docker-sdk-python flake8 docker tests
+	docker run -t --rm docker-sdk-python flake8 docker tests
 
 .PHONY: docs
 docs: build-docs
-	docker run --rm -it -v `pwd`:/src docker-sdk-python-docs sphinx-build docs docs/_build
+	docker run --rm -t -v `pwd`:/src docker-sdk-python-docs sphinx-build docs docs/_build
 
 .PHONY: shell
 shell: build

appveyor.yml

@@ -3,7 +3,7 @@ version: '{branch}-{build}'
 install:
   - "SET PATH=C:\\Python27-x64;C:\\Python27-x64\\Scripts;%PATH%"
   - "python --version"
-  - "pip install tox==2.7.0 virtualenv==15.1.0"
+  - "pip install tox==2.9.1"
 
 # Build the binary after tests
 build: false