From 65d549535ed5abe4a5aae90c609be66378033e97 Mon Sep 17 00:00:00 2001
From: Jon Sten <jons@axis.com>
Date: Thu, 9 Jan 2020 07:21:21 +0100
Subject: [PATCH 1/2] Remove automatic fingerprinting from Image.inside() step.

Automatic fingerprinting was removed in PR #180, but for some reason
Image.inside() was left unchanged.

Also removes incorrect documentation that was missed in PR #180.
---
 .../jenkinsci/plugins/docker/workflow/WithContainerStep.java    | 1 -
 .../org/jenkinsci/plugins/docker/workflow/DockerDSL/help.jelly  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
index 8c6ccfb1a..2aae84a00 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
@@ -206,7 +206,6 @@ public Execution() {
                         "Alternatively you can force image entrypoint to be disabled by adding option `--entrypoint=''`.");
             }
 
-            DockerFingerprints.addRunFacet(dockerClient.getContainerRecord(env, container), run);
             ImageAction.add(step.image, run);
             getContext().newBodyInvoker().
                     withContext(BodyInvoker.mergeLauncherDecorators(getContext().get(LauncherDecorator.class), new Decorator(container, envHost, ws, toolName, dockerVersion))).
diff --git a/src/main/resources/org/jenkinsci/plugins/docker/workflow/DockerDSL/help.jelly b/src/main/resources/org/jenkinsci/plugins/docker/workflow/DockerDSL/help.jelly
index b236bd723..f5344c4dd 100644
--- a/src/main/resources/org/jenkinsci/plugins/docker/workflow/DockerDSL/help.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/docker/workflow/DockerDSL/help.jelly
@@ -47,7 +47,6 @@
                 Runs <code>docker build</code> to create and tag the specified image from a <code>Dockerfile</code> in the current directory.
                 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.
                 Returns the resulting <code>Image</code> object.
-                Records a <code>FROM</code> fingerprint in the build.
             </p>
         </dd>
         <dt><code>Image.id</code></dt>
@@ -62,7 +61,6 @@
                 Uses <code>docker run</code> to run the image, and returns a <code>Container</code> which you could <code>stop</code> later.
                 Additional <code>args</code> may be added, such as <code>'-p 8080:8080 --memory-swap=-1'</code>.
                 Optional <code>command</code> is equivalent to Docker command specified after the image.
-                Records a run fingerprint in the build.
             </p>
         </dd>
         <dt><code>Image.withRun[(args[, command])] {…}</code></dt>

From 7e05f2cd922231ae79bce22099d8110b6a732ec4 Mon Sep 17 00:00:00 2001
From: Jon Sten <jons@axis.com>
Date: Thu, 9 Jan 2020 12:58:08 +0100
Subject: [PATCH 2/2] Removed unused import

---
 .../org/jenkinsci/plugins/docker/workflow/WithContainerStep.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
index 2aae84a00..41f4910b3 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
@@ -49,7 +49,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import org.jenkinsci.plugins.docker.commons.fingerprint.DockerFingerprints;
 import org.jenkinsci.plugins.docker.commons.tools.DockerTool;
 import org.jenkinsci.plugins.docker.workflow.client.DockerClient;
 import org.jenkinsci.plugins.docker.workflow.client.WindowsDockerClient;