Merge pull request jenkinsci#111 from ericsmalling/master

[FIXED JENKINS-44609] Docker multi-stage builds no longer throw errors

Author: abayer

src/main/java/org/jenkinsci/plugins/docker/workflow/FromFingerprintStep.java

@@ -99,7 +99,7 @@ public static class Execution extends AbstractSynchronousNonBlockingStepExecutio
                         }
                         if (line.startsWith("FROM ")) {
                             fromImage = line.substring(5);
-                            break;
+                            continue;
                         }
                     }
                 } finally {

src/test/java/org/jenkinsci/plugins/docker/workflow/DockerDSLTest.java

@@ -25,6 +25,7 @@
 
 import static org.jenkinsci.plugins.docker.workflow.DockerTestUtil.assumeDocker;
 
+import hudson.util.VersionNumber;
 import org.jenkinsci.plugins.docker.workflow.client.DockerClient;
 import hudson.EnvVars;
 import hudson.Launcher;
@@ -325,6 +326,47 @@ private static void grep(File dir, String text, String prefix, Set<String> match
         });
     }
 
+    @Test public void buildWithMultiStage() {
+        story.addStep(new Statement() {
+            @Override public void evaluate() throws Throwable {
+                assumeDocker(new VersionNumber("17.05"));
+                WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "prj");
+                p.setDefinition(new CpsFlowDefinition(
+                        "node {\n" +
+                                "  sh 'mkdir -p child'\n" +
+                                "  writeFile file: 'child/stuff1', text: 'hello'\n" +
+                                "  writeFile file: 'child/stuff2', text: 'world'\n" +
+                                "  writeFile file: 'child/stuff3', text: env.BUILD_NUMBER\n" +
+                                "  writeFile file: 'child/Dockerfile.other', " +
+                                     "text: '# This is a test.\\n" +
+                                            "\\n" +
+                                            "FROM hello-world AS one\\n" +
+                                            "ARG stuff4=4\\n" +
+                                            "ARG stuff5=5\\n" +
+                                            "COPY stuff1 /\\n" +
+                                            "FROM scratch\\n" +
+                                            "COPY --from=one /stuff1 /\\n" +
+                                            "COPY stuff2 /\\nCOPY stuff3 /\\n'\n" +
+                                "  def built = docker.build 'hello-world-stuff-arguments', '-f child/Dockerfile.other --build-arg stuff4=build4 --build-arg stuff5=build5 child'\n" +
+                                "  echo \"built ${built.id}\"\n" +
+                                "}", true));
+
+// Note the absence '--pull' in the above docker build ags as compared to other tests.
+// This is due to a Docker bug: https://github.com/docker/for-mac/issues/1751
+// It can be re-added when that is fixed
+
+                WorkflowRun b = story.j.assertBuildStatusSuccess(p.scheduleBuild2(0));
+                DockerClient client = new DockerClient(new Launcher.LocalLauncher(StreamTaskListener.NULL), null, null);
+                String descendantImageId1 = client.inspect(new EnvVars(), "hello-world-stuff-arguments", ".Id");
+                story.j.assertLogContains("built hello-world-stuff-arguments", b);
+                story.j.assertLogNotContains(" --no-cache ", b);
+                story.j.assertLogContains(descendantImageId1.replaceFirst("^sha256:", "").substring(0, 12), b);
+                story.j.assertLogContains(" --build-arg stuff4=build4 ", b);
+                story.j.assertLogContains(" --build-arg stuff5=build5 ", b);
+            }
+        });
+    }
+
     @Test public void buildArguments() {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {

src/test/java/org/jenkinsci/plugins/docker/workflow/DockerTestUtil.java

@@ -39,16 +39,21 @@
  * @author <a href="mailto:[email protected]">[email protected]</a>
  */
 public class DockerTestUtil {
-    
+    public static String DEFAULT_MINIMUM_VERSION = "1.3";
+
     public static void assumeDocker() throws Exception {
+        assumeDocker(new VersionNumber(DEFAULT_MINIMUM_VERSION));
+    }
+    
+    public static void assumeDocker(VersionNumber minimumVersion) throws Exception {
         Launcher.LocalLauncher localLauncher = new Launcher.LocalLauncher(StreamTaskListener.NULL);
         try {
             Assume.assumeThat("Docker working", localLauncher.launch().cmds(DockerTool.getExecutable(null, null, null, null), "ps").start().joinWithTimeout(DockerClient.CLIENT_TIMEOUT, TimeUnit.SECONDS, localLauncher.getListener()), is(0));
         } catch (IOException x) {
             Assume.assumeNoException("have Docker installed", x);
         }
         DockerClient dockerClient = new DockerClient(localLauncher, null, null);
-        Assume.assumeFalse("Docker version not < 1.3", dockerClient.version().isOlderThan(new VersionNumber("1.3")));
+        Assume.assumeFalse("Docker version not < " + minimumVersion.toString(), dockerClient.version().isOlderThan(minimumVersion));
     }
 
     private DockerTestUtil() {}