fix windows path issue and skip whoami on Windows for now

Author: jetersen

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

@@ -114,7 +114,7 @@ public static class Execution extends AbstractStepExecutionImpl {
 
             LOGGER.log(Level.FINE, "reduced environment: {0}", envReduced);
             workspace.mkdirs(); // otherwise it may be owned by root when created for -v
-            String ws = workspace.getRemote();
+            String ws = getPath(workspace);
             toolName = step.toolName;
             DockerClient dockerClient = launcher.isUnix()
                 ? new DockerClient(launcher, node, toolName)
@@ -136,7 +136,7 @@ public static class Execution extends AbstractStepExecutionImpl {
 
             FilePath tempDir = tempDir(workspace);
             tempDir.mkdirs();
-            String tmp = tempDir.getRemote();
+            String tmp = getPath(tempDir);
 
             Map<String, String> volumes = new LinkedHashMap<String, String>();
             Collection<String> volumesFromContainers = new LinkedHashSet<String>();
@@ -190,6 +190,15 @@ public static class Execution extends AbstractStepExecutionImpl {
             return false;
         }
 
+        private String getPath(FilePath filePath)
+            throws IOException, InterruptedException {
+            if (launcher.isUnix()) {
+                return filePath.getRemote();
+            } else {
+                return filePath.toURI().getPath().substring(1).replace("\\", "/");
+            }
+        }
+
         // TODO use 1.652 use WorkspaceList.tempDir
         private static FilePath tempDir(FilePath ws) {
             return ws.sibling(ws.getName() + System.getProperty(WorkspaceList.class.getName(), "@") + "tmp");

src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java

@@ -31,10 +31,6 @@
 import hudson.model.Node;
 import hudson.util.ArgumentListBuilder;
 import hudson.util.VersionNumber;
-import org.jenkinsci.plugins.docker.commons.fingerprint.ContainerRecord;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -44,18 +40,22 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Map;
 import java.util.List;
-import java.util.Arrays;
+import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import org.apache.commons.lang.StringUtils;
+import org.jenkinsci.plugins.docker.commons.fingerprint.ContainerRecord;
 import org.jenkinsci.plugins.docker.commons.tools.DockerTool;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -106,7 +106,12 @@ public DockerClient(@Nonnull Launcher launcher, @CheckForNull Node node, @CheckF
     public String run(@Nonnull EnvVars launchEnv, @Nonnull String image, @CheckForNull String args, @CheckForNull String workdir, @Nonnull Map<String, String> volumes, @Nonnull Collection<String> volumesFromContainers, @Nonnull EnvVars containerEnv, @Nonnull String user, @Nonnull String... command) throws IOException, InterruptedException {
         ArgumentListBuilder argb = new ArgumentListBuilder();
 
-        argb.add("run", "-t", "-d", "-u", user);
+        argb.add("run", "-t", "-d");
+
+        // Username might be empty because we are running on Windows
+        if (StringUtils.isNotEmpty(user)) {
+            argb.add("-u", user);
+        }
         if (args != null) {
             argb.addTokenized(args);
         }
@@ -306,6 +311,10 @@ private LaunchResult launch(@CheckForNull @Nonnull EnvVars launchEnv, boolean qu
      * @return a {@link String} containing the <strong>uid:gid</strong>.
      */
     public String whoAmI() throws IOException, InterruptedException {
+        if (!launcher.isUnix()) {
+            // Windows does not support username
+            return "";
+        }
         ByteArrayOutputStream userId = new ByteArrayOutputStream();
         launcher.launch().cmds("id", "-u").quiet(true).stdout(userId).start().joinWithTimeout(CLIENT_TIMEOUT, TimeUnit.SECONDS, launcher.getListener());
 
@@ -367,6 +376,6 @@ public List<String> getVolumes(@Nonnull EnvVars launchEnv, String containerID) t
         if (volumes.isEmpty()) {
             return Collections.emptyList();
         }
-        return Arrays.asList(volumes.split("\\n"));
+        return Arrays.asList(volumes.replace("\\", "/").split("\\n"));
     }
 }