pull()
}
- docker.script.withDockerContainer(image: id, args: args, toolName: docker.script.env.DOCKER_TOOL_NAME) {
+ docker.script.withDockerContainer(image: imageName(), args: args, toolName: docker.script.env.DOCKER_TOOL_NAME) {
body()
}
}
@@ -133,7 +134,7 @@ class Docker implements Serializable {
public Container run(String args = '', String command = "") {
docker.node {
- def container = docker.script.sh(script: "docker run -d${args != '' ? ' ' + args : ''} ${id}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
+ def container = docker.script.sh(script: "docker run -d${args != '' ? ' ' + args : ''} ${imageName()}${command != '' ? ' ' + command : ''}", returnStdout: true).trim()
docker.script.dockerFingerprintRun containerId: container, toolName: docker.script.env.DOCKER_TOOL_NAME
new Container(docker, container)
}
@@ -154,7 +155,7 @@ class Docker implements Serializable {
docker.node {
def taggedImageName = toQualifiedImageName(parsedId.userAndRepo + ':' + tagName)
// TODO as of 1.10.0 --force is deprecated; for 1.12+ do not try it even once
- docker.script.sh "docker tag --force=${force} ${id} ${taggedImageName} || docker tag ${id} ${taggedImageName}"
+ docker.script.sh "docker tag --force=${force} ${imageName()} ${taggedImageName} || docker tag ${imageName()} ${taggedImageName}"
return taggedImageName;
}
}