Skip to content

Don't delete images if deleteOnExit is false #5391

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 6 commits into from
May 24, 2022
Merged

Don't delete images if deleteOnExit is false #5391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b081091
Don't delete images if `deleteOnExit` is false
kiview May 23, 2022
0b01b44
Remove unnecessary user attribute on Dockerfile
kiview May 23, 2022
3a94ce1
Delete image, even if test fails
kiview May 23, 2022
123674c
Delete image, even if test fails
kiview May 23, 2022
8346e71
Update core/src/test/java/org/testcontainers/images/builder/ImageFrom…
kiview May 24, 2022
1cf34ef
Merge branch 'master' into delete-on-exit-image-fix
eddumelendez May 24, 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
10 changes: 5 additions & 5 deletions core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ protected final String resolve() {
DockerClient dockerClient = DockerClientFactory.instance().client();

try {
if (deleteOnExit) {
ResourceReaper.instance().registerImageForCleanup(dockerImageName);
}

BuildImageResultCallback resultCallback = new BuildImageResultCallback() {
@Override
Expand All @@ -114,9 +111,12 @@ public void onNext(BuildResponseItem item) {
if (buildImageCmd.getLabels() != null) {
labels.putAll(buildImageCmd.getLabels());
}

labels.putAll(DockerClientFactory.DEFAULT_LABELS);
//noinspection deprecation
labels.putAll(ResourceReaper.instance().getLabels());
if (deleteOnExit) {
//noinspection deprecation
labels.putAll(ResourceReaper.instance().getLabels());
}
buildImageCmd.withLabels(labels);

prePullDependencyImages(dependencyImageNames);
Expand Down
19 changes: 19 additions & 0 deletions core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.github.dockerjava.api.command.InspectImageResponse;
import org.junit.Test;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.utility.Base58;

import static org.assertj.core.api.Assertions.assertThat;

Expand All @@ -24,4 +25,22 @@ public void shouldAddDefaultLabels() {
.containsAllEntriesOf(DockerClientFactory.DEFAULT_LABELS);
}

@Test
public void shouldNotAddSessionLabelIfDeleteOnExitIsFalse() {
ImageFromDockerfile image = new ImageFromDockerfile("localhost/testcontainers/" + Base58.randomString(16).toLowerCase(), false)
.withDockerfileFromBuilder(it -> it.from("scratch"));
String imageId = image.resolve();
DockerClient dockerClient = DockerClientFactory.instance().client();

try {
InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
assertThat(inspectImageResponse.getConfig().getLabels())
.doesNotContainKey(DockerClientFactory.TESTCONTAINERS_SESSION_ID_LABEL);
} finally {
// ensure the image is deleted, even if the test fails
dockerClient.removeImageCmd(imageId).exec();
}

}

}