Updated changes to support docker.inside in reference to PR-98

Author: rbutcher

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

@@ -151,6 +151,9 @@ public static class Execution extends AbstractStepExecutionImpl {
                     throw new AbortException("The docker version is less than v1.7. Pipeline functions requiring 'docker exec' (e.g. 'docker.inside') or SELinux labeling will not work.");
                 } else if (dockerVersion.isOlderThan(new VersionNumber("1.8"))) {
                     listener.error("The docker version is less than v1.8. Running a 'docker.inside' from inside a container will not work.");
+                } else if (dockerVersion.isOlderThan(new VersionNumber("1.13"))) {
+                    if (!launcher.isUnix())
+                        throw new AbortException("The docker version is less than v1.13. Running a 'docker.inside' from inside a Windows container will not work.");
                 }
             } else {
                 listener.error("Failed to parse docker version. Please note there is a minimum docker version requirement of v1.7.");

src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy

@@ -75,11 +75,17 @@ class Docker implements Serializable {
         new Image(this, id)
     }
 
+    String shell() {
+        node {
+            script.isUnix() ? "sh" : "bat"
+        }
+    }
+
     public Image build(String image, String args = '.') {
         node {
             def commandLine = "docker build -t ${image} ${args}"
 
-            script.sh commandLine
+            script."${shell()}" commandLine
             this.image(image)
         }
     }
@@ -107,11 +113,11 @@ class Docker implements Serializable {
         public <V> V inside(String args = '', Closure<V> body) {
             docker.node {
                 def toRun = imageName()
-                if (toRun != id && docker.script.sh(script: "docker inspect -f . ${id}", returnStatus: true) == 0) {
+                if (toRun != id && docker.script."${shell()}"(script: "docker inspect -f . ${id}", returnStatus: true) == 0) {
                     // Can run it without registry prefix, because it was locally built.
                     toRun = id
                 } else {
-                    if (docker.script.sh(script: "docker inspect -f . ${toRun}", returnStatus: true) != 0) {
+                    if (docker.script."${shell()}"(script: "docker inspect -f . ${toRun}", returnStatus: true) != 0) {
                         // Not yet present locally.
                         // withDockerContainer requires the image to be available locally, since its start phase is not a durable task.
                         pull()
@@ -125,13 +131,13 @@ class Docker implements Serializable {
 
         public void pull() {
             docker.node {
-                docker.script.sh "docker pull ${imageName()}"
+                docker.script."${shell()}" "docker pull ${imageName()}"
             }
         }
 
         public Container run(String args = '', String command = "") {
             docker.node {
-                def container = docker.script.sh(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
+                def container = docker.script."${shell()}"(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
                 new Container(docker, container)
             }
         }
@@ -150,7 +156,7 @@ class Docker implements Serializable {
         public void tag(String tagName = parsedId.tag, boolean force = true) {
             docker.node {
                 def taggedImageName = toQualifiedImageName(parsedId.userAndRepo + ':' + tagName)
-                docker.script.sh "docker tag ${id} ${taggedImageName}"
+                docker.script."${shell()}" "docker tag ${id} ${taggedImageName}"
                 return taggedImageName;
             }
         }
@@ -160,7 +166,7 @@ class Docker implements Serializable {
                 // The image may have already been tagged, so the tagging may be a no-op.
                 // That's ok since tagging is cheap.
                 def taggedImageName = tag(tagName, force)
-                docker.script.sh "docker push ${taggedImageName}"
+                docker.script."${shell()}" "docker push ${taggedImageName}"
             }
         }
 
@@ -177,11 +183,11 @@ class Docker implements Serializable {
         }
 
         public void stop() {
-            docker.script.sh "docker stop ${id} && docker rm -f ${id}"
+            docker.script."${shell()}" "docker stop ${id} && docker rm -f ${id}"
         }
 
         public String port(int port) {
-            docker.script.sh(script: "docker port ${id} ${port}", returnStdout: true).trim()
+            docker.script."${shell()}"(script: "docker port ${id} ${port}", returnStdout: true).trim()
         }
     }