summaryrefslogtreecommitdiff
path: root/Jenkinsfile
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2017-06-16 14:05:54 -0700
committerJoffrey F <f.joffrey@gmail.com>2017-08-17 13:38:40 -0700
commit7139e2d8f1ea82340417add02090bfaf7794f159 (patch)
treec67c9c943d5ddd459600e239d14dcdc4b6e7253d /Jenkinsfile
parent9e793806ff79559c3bc591d8c52a3bbe3cdb7350 (diff)
downloaddocker-py-7139e2d8f1ea82340417add02090bfaf7794f159.tar.gz
Return generator for output of load_image endpoint
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 3579278..9e1b491 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,9 +5,8 @@ def imageNamePy2
def imageNamePy3
def images = [:]
-// Note: Swarm in dind seem notoriously flimsy with 1.12.1+, which is why we're
-// sticking with 1.12.0 for the 1.12 series
-def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce-rc5"]
+
+def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce"]
def buildImage = { name, buildargs, pyTag ->
img = docker.image(name)