diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-07-07 13:20:29 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-07-07 14:20:29 -0400 |
| commit | c033c901fe9ca31c2f4cb3e12ddd72ca9eca5bf2 (patch) | |
| tree | 5f6737400d0da3df80ac1e5342a5126b049c7279 | |
| parent | f564b7e4cfc7a449a0bbf1a53fa20767a8b92bce (diff) | |
| download | cryptography-c033c901fe9ca31c2f4cb3e12ddd72ca9eca5bf2.tar.gz cryptography-c033c901fe9ca31c2f4cb3e12ddd72ca9eca5bf2.tar.bz2 cryptography-c033c901fe9ca31c2f4cb3e12ddd72ca9eca5bf2.zip | |
explicitly pull the latest docker image in jenkins (#3760)
* explicitly pull the latest docker image in jenkins
Right now we don't need to do this since the same jenkins instance that
builds the images and tags them also pushes them, so it is guaranteed to
always have the latest. However, if we want to add another docker
builder that is no longer true, so let's always pull
* mos(t) def
* also this one
| -rw-r--r-- | .jenkins/Jenkinsfile-cryptography-wheel-builder | 4 | ||||
| -rw-r--r-- | Jenkinsfile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.jenkins/Jenkinsfile-cryptography-wheel-builder b/.jenkins/Jenkinsfile-cryptography-wheel-builder index e784f426..c4404c25 100644 --- a/.jenkins/Jenkinsfile-cryptography-wheel-builder +++ b/.jenkins/Jenkinsfile-cryptography-wheel-builder @@ -167,7 +167,9 @@ for (config in configs) { builders[combinedName] = { node(label) { stage(combinedName) { - docker.image(imageName).inside("-u root") { + def buildImage = docker.image(imageName) + buildImage.pull() + buildImage.inside("-u root") { build(version, label, imageName) } } diff --git a/Jenkinsfile b/Jenkinsfile index 3492b54b..c7710d64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -306,7 +306,9 @@ for (config in configs) { builders[combinedName] = { node(label) { stage(combinedName) { - docker.image(imageName).inside { + def buildImage = docker.image(imageName) + buildImage.pull() + buildImage.inside { build(toxenv, label, imageName, artifacts, artifactExcludes) } } |