Modified RyukResourceReaper to register shutdown hook only when the v…

…alue of new configuration property 'ryuk.container.shutdownhook' has been set to true (discussion testcontainers#7454).
alex-arana · Apr 6, 2024 · a0fcbdf · a0fcbdf
1 parent 5969b0f
commit a0fcbdf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,6 +34,7 @@ subprojects {
     apply plugin: 'checkstyle'
 
     group = "org.testcontainers"
+    version = rootProject["testcontainers.version"]
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

diff --git a/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java b/core/src/main/java/org/testcontainers/utility/RyukResourceReaper.java
@@ -77,18 +77,20 @@ private synchronized void maybeStart() {
 
         ryukContainer.start();
 
-        Runtime
-            .getRuntime()
-            .addShutdownHook(
-                new Thread(
-                    DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
-                    () -> {
-                        this.dockerClient.killContainerCmd(this.ryukContainer.getContainerId())
-                            .withSignal("SIGTERM")
-                            .exec();
-                    }
-                )
-            );
+        if (TestcontainersConfiguration.getInstance().isRyukShutdownHookEnabled()) {
+            Runtime
+                .getRuntime()
+                .addShutdownHook(
+                    new Thread(
+                        DockerClientFactory.TESTCONTAINERS_THREAD_GROUP,
+                        () -> {
+                            this.dockerClient.killContainerCmd(this.ryukContainer.getContainerId())
+                                .withSignal("SIGTERM")
+                                .exec();
+                        }
+                    )
+                );
+        }
 
         CountDownLatch ryukScheduledLatch = new CountDownLatch(1);
 

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -141,6 +141,10 @@ public boolean isRyukPrivileged() {
         return Boolean.parseBoolean(getEnvVarOrProperty("ryuk.container.privileged", "true"));
     }
 
+    public boolean isRyukShutdownHookEnabled() {
+        return Boolean.parseBoolean(getEnvVarOrProperty("ryuk.container.shutdownhook", "false"));
+    }
+
     @Deprecated
     public String getRyukImage() {
         return getImage(RYUK_IMAGE).asCanonicalNameString();