Skip to content

fix: use correct syntax for environment variable #244

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
rsandell merged 4 commits into from
Jan 28, 2022
Merged

fix: use correct syntax for environment variable #244

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d30ddd
fix: use correct syntax for environment variable
viceice Jan 19, 2022
822b140
fix: wrong method access
viceice Jan 19, 2022
a7efdb6
chore: refactor node calls
viceice Jan 27, 2022
b4d40ba
fix: escape dollar
viceice Jan 27, 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
42 changes: 26 additions & 16 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,18 +75,21 @@ class Docker implements Serializable {
new Image(this, id)
}

String shell() {
node {
script.isUnix() ? "sh" : "bat"
}
String shell(boolean isUnix) {
isUnix ? "sh" : "bat"
}

String asEnv(boolean isUnix, String var) {
isUnix ? "\$${var}" : "%${var}%"
}

public Image build(String image, String args = '.') {
check(image)
node {
def commandLine = 'docker build -t "$JD_IMAGE" ' + args
def isUnix = script.isUnix()
def commandLine = 'docker build -t "' + asEnv(isUnix, 'JD_IMAGE') + '" ' + args
script.withEnv(["JD_IMAGE=${image}"]) {
script."${shell()}" commandLine
script."${shell(isUnix)}" commandLine
}
this.image(image)
}
Expand Down Expand Up @@ -121,12 +124,13 @@ class Docker implements Serializable {
public <V> V inside(String args = '', Closure<V> body) {
docker.node {
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()}"(script: 'docker inspect -f . "$JD_ID"', returnStatus: true) == 0) {
if (toRun != id && docker.script."${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()}"(script: 'docker inspect -f . "$JD_TO_RUN"', returnStatus: true) != 0) {
if (docker.script."${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 @@ -142,16 +146,18 @@ class Docker implements Serializable {
public void pull() {
docker.node {
def toPull = imageName()
def isUnix = docker.script.isUnix()
docker.script.withEnv(["JD_TO_PULL=${toPull}"]) {
docker.script."${docker.shell()}" 'docker pull "$JD_TO_PULL"'
docker.script."${docker.shell(isUnix)}" 'docker pull "' + docker.asEnv(isUnix, 'JD_TO_PULL') + '"'
}
}
}

public Container run(String args = '', String command = "") {
docker.node {
def container = docker.script."${docker.shell()}"(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
new Container(docker, container)
def isUnix = docker.script.isUnix()
def container = docker.script."${docker.shell(isUnix)}"(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
new Container(docker, container, isUnix)
}
}

Expand All @@ -169,8 +175,9 @@ class Docker implements Serializable {
public void tag(String tagName = parsedId.tag, boolean force = true) {
docker.node {
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()}" 'docker tag "$JD_ID" "$JD_TAGGED_IMAGE_NAME"'
docker.script."${docker.shell(isUnix)}" 'docker tag "' + docker.asEnv(isUnix, 'JD_ID') + '" "' + docker.asEnv(isUnix, 'JD_TAGGED_IMAGE_NAME') + '"'
}
return taggedImageName;
}
Expand All @@ -181,8 +188,9 @@ class Docker implements Serializable {
// The image may have already been tagged, so the tagging may be a no-op.
// That's ok since tagging is cheap.
def taggedImageName = tag(tagName, force)
def isUnix = docker.script.isUnix()
docker.script.withEnv(["JD_TAGGED_IMAGE_NAME=${taggedImageName}"]) {
docker.script."${docker.shell()}" 'docker push "$JD_TAGGED_IMAGE_NAME"'
docker.script."${docker.shell(isUnix)}" 'docker push "' + docker.asEnv(isUnix, 'JD_TAGGED_IMAGE_NAME') + '"'
}
}
}
Expand All @@ -192,22 +200,24 @@ class Docker implements Serializable {
public static class Container implements Serializable {

private final Docker docker;
private final boolean isUnix;
public final String id;

private Container(Docker docker, String id) {
private Container(Docker docker, String id, boolean isUnix) {
this.docker = docker
this.id = id
this.isUnix = isUnix;
}

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

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