Don't delete images if deleteOnExit is false (#5391)

Co-authored-by: Eddú Meléndez Gonzales <[email protected]>

Author: kiview

core/src/main/java/org/testcontainers/images/builder/ImageFromDockerfile.java

@@ -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
@@ -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);

core/src/test/java/org/testcontainers/images/builder/ImageFromDockerfileTest.java

@@ -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;
 
@@ -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();
+        }
+
+    }
+
 }