From f4124a505c4574c3f4ebdbfc8348db5fd81793be Mon Sep 17 00:00:00 2001 From: Antoine DUPRAT Date: Thu, 19 Dec 2019 23:03:30 +0100 Subject: [PATCH] JENKINS-48417 Add the ability to run docker container in foreground --- .../org/jenkinsci/plugins/docker/workflow/Docker.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy b/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy index 71308f1f1..cd31cb301 100644 --- a/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy +++ b/src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy @@ -135,9 +135,9 @@ class Docker implements Serializable { } } - public Container run(String args = '', String command = "") { + public Container run(String args = '', String command = "", boolean foreground = false) { docker.node { - def container = docker.script."${docker.shell()}"(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim() + def container = docker.script."${docker.shell()}"(script: "docker run ${!foreground ? '-d' : ''} ${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim() new Container(docker, container) } }