Skip to content

Fix WithContainerStep.start for older versions of Docker that use busybox #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shimpossible wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix WithContainerStep.start for older versions of Docker that use busybox #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,18 @@ public Execution() {
}

String command = dockerClient.runCommand();
// BusyBox will print the command name wrapped in {} or [],
// if what is running doesn't match the command. See read_cmdline in libbb/procpc.c
// this is the case with a call to 'cat'
String command_alt1 = "{"+command+"}";
String command_alt2 = "["+command+"]";

container = dockerClient.run(env, step.image, step.args, ws, volumes, volumesFromContainers, envReduced, dockerClient.whoAmI(), /* expected to hang until killed */ command);
final List<String> ps = dockerClient.listProcess(env, container);
if (!ps.contains(command)) {
if (!ps.contains(command) &&
!ps.contains(command_alt1) &&
!ps.contains(command_alt2)
) {
listener.error(
"The container started but didn't run the expected command. " +
"Please double check your ENTRYPOINT does execute the command passed as docker run argument, " +
Expand Down