-
Notifications
You must be signed in to change notification settings - Fork 415
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #184 from 3shapeAS/features/windows_slaves
Features/windows agents with pathing issues fixed
- Loading branch information
Showing
7 changed files
with
291 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
src/main/java/org/jenkinsci/plugins/docker/workflow/client/WindowsDockerClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| package org.jenkinsci.plugins.docker.workflow.client; | ||
|
|
||
| import com.google.common.base.Optional; | ||
| import hudson.EnvVars; | ||
| import hudson.FilePath; | ||
| import hudson.Launcher; | ||
| import hudson.model.Node; | ||
| import hudson.util.ArgumentListBuilder; | ||
|
|
||
| import javax.annotation.CheckForNull; | ||
| import javax.annotation.Nonnull; | ||
| import java.io.*; | ||
| import java.nio.charset.Charset; | ||
| import java.util.*; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| public class WindowsDockerClient extends DockerClient { | ||
| private static final Logger LOGGER = Logger.getLogger(WindowsDockerClient.class.getName()); | ||
|
|
||
| private final Launcher launcher; | ||
| private final Node node; | ||
|
|
||
| public WindowsDockerClient(@Nonnull Launcher launcher, @CheckForNull Node node, @CheckForNull String toolName) { | ||
| super(launcher, node, toolName); | ||
| this.launcher = launcher; | ||
| this.node = node; | ||
| } | ||
|
|
||
| @Override | ||
| 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("docker", "run", "-d", "-t"); | ||
| if (args != null) { | ||
| argb.addTokenized(args); | ||
| } | ||
|
|
||
| if (workdir != null) { | ||
| argb.add("-w", workdir); | ||
| } | ||
| for (Map.Entry<String, String> volume : volumes.entrySet()) { | ||
| argb.add("-v", volume.getKey() + ":" + volume.getValue()); | ||
| } | ||
| for (String containerId : volumesFromContainers) { | ||
| argb.add("--volumes-from", containerId); | ||
| } | ||
| for (Map.Entry<String, String> variable : containerEnv.entrySet()) { | ||
| argb.add("-e"); | ||
| argb.addMasked(variable.getKey()+"="+variable.getValue()); | ||
| } | ||
| argb.add(image).add(command); | ||
|
|
||
| LaunchResult result = launch(launchEnv, false, null, argb); | ||
| if (result.getStatus() == 0) { | ||
| return result.getOut(); | ||
| } else { | ||
| throw new IOException(String.format("Failed to run image '%s'. Error: %s", image, result.getErr())); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> listProcess(@Nonnull EnvVars launchEnv, @Nonnull String containerId) throws IOException, InterruptedException { | ||
| LaunchResult result = launch(launchEnv, false, null, "docker", "top", containerId); | ||
| if (result.getStatus() != 0) { | ||
| throw new IOException(String.format("Failed to run top '%s'. Error: %s", containerId, result.getErr())); | ||
| } | ||
| List<String> processes = new ArrayList<>(); | ||
| try (Reader r = new StringReader(result.getOut()); | ||
| BufferedReader in = new BufferedReader(r)) { | ||
| String line; | ||
| in.readLine(); // ps header | ||
| while ((line = in.readLine()) != null) { | ||
| final StringTokenizer stringTokenizer = new StringTokenizer(line, " "); | ||
| if (stringTokenizer.countTokens() < 1) { | ||
| throw new IOException("Unexpected `docker top` output : "+line); | ||
| } | ||
|
|
||
| processes.add(stringTokenizer.nextToken()); // COMMAND | ||
| } | ||
| } | ||
| return processes; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<String> getContainerIdIfContainerized() throws IOException, InterruptedException { | ||
| if (node == null || | ||
| launch(new EnvVars(), true, null, "sc.exe", "query", "cexecsvc").getStatus() != 0) { | ||
| return Optional.absent(); | ||
| } | ||
|
|
||
| LaunchResult getComputerName = launch(new EnvVars(), true, null, "hostname"); | ||
| if(getComputerName.getStatus() != 0) { | ||
| throw new IOException("Failed to get hostname."); | ||
| } | ||
|
|
||
| String shortID = getComputerName.getOut().toLowerCase(); | ||
| LaunchResult getLongIdResult = launch(new EnvVars(), true, null, "docker", "inspect", shortID, "--format={{.Id}}"); | ||
| if(getLongIdResult.getStatus() != 0) { | ||
| LOGGER.log(Level.INFO, "Running inside of a container but cannot determine container ID from current environment."); | ||
| return Optional.absent(); | ||
| } | ||
|
|
||
| return Optional.of(getLongIdResult.getOut()); | ||
| } | ||
|
|
||
| @Override | ||
| public String whoAmI() throws IOException, InterruptedException { | ||
| try (ByteArrayOutputStream userId = new ByteArrayOutputStream()) { | ||
| launcher.launch().cmds("whoami").quiet(true).stdout(userId).start().joinWithTimeout(CLIENT_TIMEOUT, TimeUnit.SECONDS, launcher.getListener()); | ||
| return userId.toString(Charset.defaultCharset().name()).trim(); | ||
| } | ||
| } | ||
|
|
||
| private LaunchResult launch(EnvVars env, boolean quiet, FilePath workDir, String... args) throws IOException, InterruptedException { | ||
| return launch(env, quiet, workDir, new ArgumentListBuilder(args)); | ||
| } | ||
| private LaunchResult launch(EnvVars env, boolean quiet, FilePath workDir, ArgumentListBuilder argb) throws IOException, InterruptedException { | ||
| if (LOGGER.isLoggable(Level.FINE)) { | ||
| LOGGER.log(Level.FINE, "Executing command \"{0}\"", argb); | ||
| } | ||
|
|
||
| Launcher.ProcStarter procStarter = launcher.launch(); | ||
| if (workDir != null) { | ||
| procStarter.pwd(workDir); | ||
| } | ||
|
|
||
| LaunchResult result = new LaunchResult(); | ||
| ByteArrayOutputStream out = new ByteArrayOutputStream(); | ||
| ByteArrayOutputStream err = new ByteArrayOutputStream(); | ||
| result.setStatus(procStarter.quiet(quiet).cmds(argb).envs(env).stdout(out).stderr(err).start().joinWithTimeout(CLIENT_TIMEOUT, TimeUnit.SECONDS, launcher.getListener())); | ||
| final String charsetName = Charset.defaultCharset().name(); | ||
| result.setOut(out.toString(charsetName)); | ||
| result.setErr(err.toString(charsetName)); | ||
|
|
||
| return result; | ||
| } | ||
| } |
Oops, something went wrong.
6d01b80There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This update seems to have broken containers on Windows, If I start a container like this:
def compileContainer = docker.image("${env.COMPILE_IMAGE_TAG}").run("--name ${compileContainerName} -v ${escapedWorkspace}:C:/work", "ping -t localhost")
My container starts. But when I come to stop it like this:
compileContainer.stop()
Then it fails, and the build log has a real mess of docker commands in it;
[2019-11-01T09:45:13.214Z] Completed Building (5.4 seconds)
[2019-11-01T09:45:13.674Z]
[2019-11-01T09:45:13.674Z] administrator@WIN-1966SFQ4FES C:\Jenkins\workspace_branches_ZEN-32525-Implement-CI>docker stop administrator@WIN-1966SFQ4FES C:\Jenkins\workspace_branches_ZEN-32525-Implement-CI run -d --name zen-32525-implement-ci_compiler_1572600576646 -v C:/Jenkins/workspace/_branches_ZEN-32525-Implement-CI:C:/work zen-32525-implement-ci_compiler ping -t localhost 1>docker
[2019-11-01T09:45:13.942Z] unknown shorthand flag: 'd' in -d
[2019-11-01T09:45:13.942Z] See 'docker stop --help'.
[2019-11-01T09:45:13.942Z]
[2019-11-01T09:45:13.942Z] administrator@WIN-1966SFQ4FES C:\Jenkins\workspace_branches_ZEN-32525-Implement-CI>46e5dae3b97f6e443203a7e3a9c176257362c1a32b9e1ed23a11846ff878a7e0 && docker rm -f administrator@WIN-1966SFQ4FES C:\Jenkins\workspace_branches_ZEN-32525-Implement-CI run -d --name zen-32525-implement-ci_compiler_1572600576646 -v C:/Jenkins/workspace/_branches_ZEN-32525-Implement-CI:C:/work zen-32525-implement-ci_compiler ping -t localhost 1>docker
[2019-11-01T09:45:13.942Z] '46e5dae3b97f6e443203a7e3a9c176257362c1a32b9e1ed23a11846ff878a7e0' is not recognized as an internal or external command,
[2019-11-01T09:45:13.943Z] operable program or batch file.
[2019-11-01T09:45:13.943Z]
[2019-11-01T09:45:13.943Z] administrator@WIN-1966SFQ4FES C:\Jenkins\workspace_branches_ZEN-32525-Implement-CI>46e5dae3b97f6e443203a7e3a9c176257362c1a32b9e1ed23a11846ff878a7e0
[2019-11-01T09:45:13.943Z] '46e5dae3b97f6e443203a7e3a9c176257362c1a32b9e1ed23a11846ff878a7e0' is not recognized as an internal or external command,
[2019-11-01T09:45:13.943Z] operable program or batch file.
It's almost like the entire run command is taken to be the container id in the stop step?
This worked in the previous version