docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2408 from thaJeztah/jenkins_update_versions 

Jenkinsfile: update API versions and update to Python 3.7
This commit is contained in:
Joffrey F 2019-08-27 00:17:59 -07:00 committed by GitHub
parent 912824e599 f0fc266eb5
commit 1fc62e6a32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jenkinsfile vendored
View File

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