Skip to content

Commit 1089131

Browse files
authored
Merge pull request #198 from jonsten/disableFingerprint
Remove automatic fingerprinting from Image.inside() step.
2 parents 74a2370 + 7e05f2c commit 1089131

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import java.util.Map;
5050
import java.util.Set;
5151
import java.util.TreeSet;
52-
import org.jenkinsci.plugins.docker.commons.fingerprint.DockerFingerprints;
5352
import org.jenkinsci.plugins.docker.commons.tools.DockerTool;
5453
import org.jenkinsci.plugins.docker.workflow.client.DockerClient;
5554
import org.jenkinsci.plugins.docker.workflow.client.WindowsDockerClient;
@@ -206,7 +205,6 @@ public Execution() {
206205
"Alternatively you can force image entrypoint to be disabled by adding option `--entrypoint=''`.");
207206
}
208207

209-
DockerFingerprints.addRunFacet(dockerClient.getContainerRecord(env, container), run);
210208
ImageAction.add(step.image, run);
211209
getContext().newBodyInvoker().
212210
withContext(BodyInvoker.mergeLauncherDecorators(getContext().get(LauncherDecorator.class), new Decorator(container, envHost, ws, toolName, dockerVersion))).

src/main/resources/org/jenkinsci/plugins/docker/workflow/DockerDSL/help.jelly

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
Runs <code>docker build</code> to create and tag the specified image from a <code>Dockerfile</code> in the current directory.
4848
Additional <code>args</code> may be added, such as <code>'-f Dockerfile.other --pull --build-arg http_proxy=http://192.168.1.1:3128 .'</code>. Like <code>docker build</code>, <code>args</code> must end with the build context.
4949
Returns the resulting <code>Image</code> object.
50-
Records a <code>FROM</code> fingerprint in the build.
5150
</p>
5251
</dd>
5352
<dt><code>Image.id</code></dt>
@@ -62,7 +61,6 @@
6261
Uses <code>docker run</code> to run the image, and returns a <code>Container</code> which you could <code>stop</code> later.
6362
Additional <code>args</code> may be added, such as <code>'-p 8080:8080 --memory-swap=-1'</code>.
6463
Optional <code>command</code> is equivalent to Docker command specified after the image.
65-
Records a run fingerprint in the build.
6664
</p>
6765
</dd>
6866
<dt><code>Image.withRun[(args[, command])] {…}</code></dt>

0 commit comments

Comments
 (0)