Skip to content

Simplify Docker.shell #243

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

Merged
jglick merged 3 commits into from
Dec 1, 2022
Merged

Simplify Docker.shell #243

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cce5361
Simplify `Docker.shell`
jglick Nov 5, 2021
60e3018
Merge branch 'master' of https://github.com/jenkinsci/docker-workflow…
jglick Jun 10, 2022
2bef7d5
Merge branch 'master' of https://github.com/jenkinsci/docker-workflow…
jglick Dec 1, 2022
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
22 changes: 11 additions & 11 deletions src/main/resources/org/jenkinsci/plugins/docker/workflow/Docker.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ class Docker implements Serializable {
new Image(this, id)
}

String shell(boolean isUnix) {
isUnix ? "sh" : "bat"
private Object shell(boolean isUnix, Object args) {
isUnix ? script.sh(args) : script.bat(args)
}

String asEnv(boolean isUnix, String var) {
Expand All @@ -89,7 +89,7 @@ class Docker implements Serializable {
def isUnix = script.isUnix()
def commandLine = 'docker build -t "' + asEnv(isUnix, 'JD_IMAGE') + '" ' + args
script.withEnv(["JD_IMAGE=${image}"]) {
script."${shell(isUnix)}" commandLine
shell(isUnix, commandLine)
}
this.image(image)
}
Expand Down Expand Up @@ -126,11 +126,11 @@ class Docker implements Serializable {
def toRun = imageName()
def isUnix = docker.script.isUnix()
docker.script.withEnv(["JD_ID=${id}", "JD_TO_RUN=${toRun}"]) {
if (toRun != id && docker.script."${docker.shell(isUnix)}"(script: 'docker inspect -f . "' + docker.asEnv(isUnix, 'JD_ID') + '"', returnStatus: true) == 0) {
if (toRun != id && docker.shell(isUnix, [script: 'docker inspect -f . "' + docker.asEnv(isUnix, 'JD_ID') + '"', returnStatus: true]) == 0) {
// Can run it without registry prefix, because it was locally built.
toRun = id
} else {
if (docker.script."${docker.shell(isUnix)}"(script: 'docker inspect -f . "' + docker.asEnv(isUnix, 'JD_TO_RUN') + '"', returnStatus: true) != 0) {
if (docker.shell(isUnix, [script: 'docker inspect -f . "' + docker.asEnv(isUnix, 'JD_TO_RUN') + '"', returnStatus: true]) != 0) {
// Not yet present locally.
// withDockerContainer requires the image to be available locally, since its start phase is not a durable task.
pull()
Expand All @@ -148,15 +148,15 @@ class Docker implements Serializable {
def toPull = imageName()
def isUnix = docker.script.isUnix()
docker.script.withEnv(["JD_TO_PULL=${toPull}"]) {
docker.script."${docker.shell(isUnix)}" 'docker pull "' + docker.asEnv(isUnix, 'JD_TO_PULL') + '"'
docker.shell(isUnix, 'docker pull "' + docker.asEnv(isUnix, 'JD_TO_PULL') + '"')
}
}
}

public Container run(String args = '', String command = "") {
docker.node {
def isUnix = docker.script.isUnix()
def container = docker.script."${docker.shell(isUnix)}"(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
def container = docker.shell(isUnix, [script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true]).trim()
new Container(docker, container, isUnix)
}
}
Expand All @@ -177,7 +177,7 @@ class Docker implements Serializable {
def taggedImageName = toQualifiedImageName(parsedId.userAndRepo + ':' + tagName)
def isUnix = docker.script.isUnix()
docker.script.withEnv(["JD_ID=${id}", "JD_TAGGED_IMAGE_NAME=${taggedImageName}"]) {
docker.script."${docker.shell(isUnix)}" 'docker tag "' + docker.asEnv(isUnix, 'JD_ID') + '" "' + docker.asEnv(isUnix, 'JD_TAGGED_IMAGE_NAME') + '"'
docker.shell(isUnix, 'docker tag "' + docker.asEnv(isUnix, 'JD_ID') + '" "' + docker.asEnv(isUnix, 'JD_TAGGED_IMAGE_NAME') + '"')
}
return taggedImageName;
}
Expand All @@ -190,7 +190,7 @@ class Docker implements Serializable {
def taggedImageName = tag(tagName, force)
def isUnix = docker.script.isUnix()
docker.script.withEnv(["JD_TAGGED_IMAGE_NAME=${taggedImageName}"]) {
docker.script."${docker.shell(isUnix)}" 'docker push "' + docker.asEnv(isUnix, 'JD_TAGGED_IMAGE_NAME') + '"'
docker.shell(isUnix, 'docker push "' + docker.asEnv(isUnix, 'JD_TAGGED_IMAGE_NAME') + '"')
}
}
}
Expand All @@ -211,13 +211,13 @@ class Docker implements Serializable {

public void stop() {
docker.script.withEnv(["JD_ID=${id}"]) {
docker.script."${docker.shell(isUnix)}" 'docker stop "' + docker.asEnv(isUnix,'JD_ID') + '" && docker rm -f --volumes "' + docker.asEnv(isUnix, 'JD_ID') + '"'
docker.shell(isUnix, 'docker stop "' + docker.asEnv(isUnix,'JD_ID') + '" && docker rm -f --volumes "' + docker.asEnv(isUnix, 'JD_ID') + '"')
}
}

public String port(int port) {
docker.script.withEnv(["JD_ID=${id}", "JD_PORT=${port}"]) {
docker.script."${docker.shell(isUnix)}"(script: 'docker port "' + docker.asEnv(isUnix, 'JD_ID') + '" "' + docker.asEnv(isUnix, 'JD_PORT') + '"', returnStdout: true).trim()
docker.shell(isUnix, [script: 'docker port "' + docker.asEnv(isUnix, 'JD_ID') + '" "' + docker.asEnv(isUnix, 'JD_PORT') + '"', returnStdout: true]).trim()
}
}
}
Expand Down