fix:ci-test

Author: taole33

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ on:
       - 'RELEASING.md'
       - '.sdkmanrc'
   push:
-    branches: [ main ]
+    branches: [ fix/issue-10365-exit-docker ]
     paths-ignore:
       - '.github/ISSUE_TEMPLATE/*.yaml'
       - '.github/CODEOWNERS'

core/src/main/java/org/testcontainers/containers/GenericContainer.java

@@ -648,6 +648,17 @@ public void stop() {
                 imageName = "<unknown>";
             }
 
+            try {
+                // タイムアウトはデフォルト(10秒)か、ユーザー指定の設定などがあればそれを使うべきですが、
+                // いったんデフォルトの挙動として stopContainerCmd を呼びます。
+                // DockerClientのstopContainerCmdはデフォルトで10秒待ちます。
+                dockerClient.stopContainerCmd(containerId).exec();
+            } catch (NotFoundException e) {
+                // コンテナが既にない場合は無視
+            } catch (Exception e) {
+                // 停止に失敗した場合のログ（ResourceReaperが後で片付けるのでここではWarn程度）
+                logger().warn("Failed to stop container gracefully: {}", e.getMessage());
+            }
             containerIsStopping(containerInfo);
             ResourceReaper.instance().stopAndRemoveContainer(containerId, imageName);
             containerIsStopped(containerInfo);

core/src/test/java/org/testcontainers/containers/Issue10365Test.java

@@ -0,0 +1,55 @@
+package org.testcontainers.containers;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.output.ToStringConsumer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
+
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class Issue10365Test {
+
+    @Test
+    public void testPostHookExecutionOnStop() {
+        String scriptContent =
+            "#!/bin/bash\n" +
+            "function on_shutdown() {\n" +
+            "  echo 'HOOK_TRIGGERED'\n" +
+            "}\n" +
+            "trap on_shutdown SIGTERM SIGINT EXIT\n" +
+            "echo 'CONTAINER_STARTED'\n" +
+            "while true; do sleep 1; done\n";
+
+        try (
+            GenericContainer<?> container = new GenericContainer<>(
+                new ImageFromDockerfile()
+                    .withFileFromString("entrypoint.sh", scriptContent)
+                    .withDockerfileFromBuilder(builder ->
+                        builder
+                            .from("alpine:3.18")
+                            .run("apk add --no-cache tini bash")
+                            .copy("entrypoint.sh", "/entrypoint.sh")
+                            .run("chmod +x /entrypoint.sh")
+                            .entryPoint("/sbin/tini", "--", "/entrypoint.sh")
+                            .build()
+                    )
+            )
+        ) {
+            ToStringConsumer logConsumer = new ToStringConsumer();
+            container.withLogConsumer(logConsumer);
+            
+            container.withStartupTimeout(Duration.ofSeconds(30));
+
+            container.start();
+
+            container.stop();
+
+            String logs = logConsumer.toUtf8String();
+            System.out.println("=== CONTAINER LOGS ===\n" + logs + "\n======================");
+
+            assertThat(logs)
+                .contains("HOOK_TRIGGERED");
+        }
+    }
+}