Merge pull request #254 from segevfiner/jenkins-47106-top-level-agent…

…-local-image [FIXED JENKINS-47106] Support alwaysPull in the top level agent section
jenkinsci · Apr 4, 2018 · fa8ed8bb0861220ff36b730656dc12701ba86ffd · fa8ed8b
2 parents f5deef1 + 5c49464
commit fa8ed8bb0861220ff36b730656dc12701ba86ffd
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 ...n/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy
diff --git a/...ces/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy b/...ces/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy
@@ -39,7 +39,7 @@ class DockerPipelineScript extends AbstractDockerPipelineScript<DockerPipeline>
    @Override
    Closure runImage(Closure body) {
        return {
-  
-            if (!Utils.withinAStage()) {
+  
+            if (!Utils.withinAStage() && describable.alwaysPull) {
                script.stage(SyntheticStageNames.agentSetup()) {
                    try {
                        script.getProperty("docker").image(describable.image).pull()
@@ -63,4 +63,4 @@ class DockerPipelineScript extends AbstractDockerPipelineScript<DockerPipeline>
            }
        }
    }
-  
-}
+  
+}