Skip to content

Remove automatic fingerprinting from Image.inside() step. #198

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
merged 2 commits into from
Jan 23, 2020
Merged

Remove automatic fingerprinting from Image.inside() step. #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d5495
Remove automatic fingerprinting from Image.inside() step.
jonsten Jan 9, 2020
7e05f2c
Removed unused import
jonsten Jan 9, 2020
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
2 changes: 0 additions & 2 deletions src/main/java/org/jenkinsci/plugins/docker/workflow/WithContainerStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -206,7 +205,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))).
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/org/jenkinsci/plugins/docker/workflow/DockerDSL/help.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down