FEA Override --workdir

Author: raydouglass

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/DockerLauncher.java

@@ -136,6 +136,9 @@ public void launchContainers() throws IOException, InterruptedException {
     private ArgumentListBuilder getlaunchArgs(DockerConfiguration config,
                                               boolean isMain) throws IOException, InterruptedException {
         String workspacePath = build.getWorkspace().getRemote();
+        String workspaceTarget = Optional.ofNullable(
+                buildWrapper.getWorkspaceOverride())
+                .orElse(workspacePath);
         //Fully resolve the source workspace
         String workspaceSrc = Paths.get(workspacePath)
                 .toAbsolutePath()
@@ -159,7 +162,6 @@ private ArgumentListBuilder getlaunchArgs(DockerConfiguration config,
         //TODO Set name? Maybe with build.toString().replaceAll("^\\w", "_")
         ArgumentListBuilder args = new ArgumentListBuilder()
                 .add("run", "-t", "-d")
-                .add("--workdir", workspacePath)
                 //Add bridge network for internet access
                 .add("--network", "bridge");
         //Add inter-container network if needed
@@ -168,8 +170,9 @@ private ArgumentListBuilder getlaunchArgs(DockerConfiguration config,
         if (isMain) {
             //Start a shell to block the container, overriding the entrypoint in case the image already defines that
             args.add("--entrypoint", "/bin/sh")
-                    .add("-v", workspaceSrc + ":" + workspacePath)
-                    ////Jenkins puts scripts here
+                    .add("--workdir", workspaceTarget)
+                    .add("-v", workspaceSrc + ":" + workspaceTarget)
+                    //Jenkins puts scripts here
                     .add("-v", tmpSrc + ":" + tmpDest);
         }
         config.addCreateArgs(this, args, build);
@@ -251,7 +254,10 @@ public Proc dockerExec(Launcher.ProcStarter starter,
         ArgumentListBuilder args = new ArgumentListBuilder()
                 .add("exec");
         if (starter.pwd() != null) {
-            args.add("--workdir", starter.pwd().getRemote());
+            String path = Optional.ofNullable(
+                    buildWrapper.getWorkspaceOverride())
+                    .orElse(starter.pwd().getRemote());
+            args.add("--workdir", path);
         }
         if (addRunArgs) {
             buildWrapper.getDockerConfiguration().addRunArgs(this, args, build);
@@ -260,6 +266,10 @@ public Proc dockerExec(Launcher.ProcStarter starter,
         args.add(mainContainerId);
 
         args.add("env").add(starter.envs());
+        if (buildWrapper.getWorkspaceOverride() != null) {
+            //Override $WORKSPACE inside the container
+            args.add("WORKSPACE=" + buildWrapper.getWorkspaceOverride());
+        }
 
         List<String> originalCmds = starter.cmds();
         boolean[] originalMask = starter.masks();

src/main/resources/com/gpuopenanalytics/jenkins/remotedocker/RemoteDockerBuildWrapper/config.jelly

@@ -40,7 +40,7 @@
     <f:entry title="Debug" field="debug">
         <f:checkbox/>
     </f:entry>
-    <f:optionalBlock name="workspaceOverrideOptional" title="Override workspace mount" inline="true">
+    <f:optionalBlock name="workspaceOverrideOptional" title="Override workspace mount" inline="true" checked="${!empty(instance.workspaceOverride)}">
         <f:entry title="Workspace path" field="workspaceOverride">
             <f:textbox/>
         </f:entry>