Merge branch 'master' into CustomDescribableModel-JENKINS-44892

jglick · jglick · commit bbea2971b298 · 2019-04-24T11:13:02.000-04:00
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
@@ -257,7 +257,8 @@ private static class Decorator extends LauncherDecorator implements Serializable
                                     prefix.add(path);
                                     masksPrefixList.add(false);
                                 } else {
-                                    launcher.getListener().getLogger().println("Docker version is older than 17.12, working directory will be " + ws + " not " + path);
+                                    String safePath = path.replace("'", "'\"'\"'");
+                                    starter.cmds().addAll(0, Arrays.asList("sh", "-c", "cd '" + safePath + "'; exec \"$@\"", "--"));
                                 }
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,8 @@ private static class Decorator extends LauncherDecorator implements Serializable`
`257`	`257`	`prefix.add(path);`
`258`	`258`	`masksPrefixList.add(false);`
`259`	`259`	`} else {`
`260`		`- launcher.getListener().getLogger().println("Docker version is older than 17.12, working directory will be " + ws + " not " + path);`
	`260`	`+ String safePath = path.replace("'", "'\"'\"'");`
	`261`	`+ starter.cmds().addAll(0, Arrays.asList("sh", "-c", "cd '" + safePath + "'; exec \"$@\"", "--"));`
`261`	`262`	`}`
`262`	`263`	`}`
`263`	`264`	`}`