Re #123: Fixed nginx testcontainers startup condition.

tkowalcz · Jul 25, 2024 · 0f93e9f · 0f93e9f
1 parent 22cb479
commit 0f93e9f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ServerNameIndicatorTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/ServerNameIndicatorTest.java
@@ -9,7 +9,6 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.NginxContainer;
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -60,9 +59,8 @@ public class ServerNameIndicatorTest {
             )
             .withExposedPorts(3100);
 
-
     @Container
-    public NginxContainer<?> nginx = new NginxContainer<>("nginx:latest")
+    public NginxContainer<?> nginx = new NginxContainer<>("nginx:1.25")
             .withNetwork(network)
             .dependsOn(loki1, loki2)
             .withClasspathResourceMapping("loki.sni.nginx.conf",
@@ -81,7 +79,11 @@ public class ServerNameIndicatorTest {
                     "/etc/nginx/passwords",
                     BindMode.READ_ONLY
             )
-            .waitingFor(new HttpWaitStrategy())
+            .waitingFor(Wait
+                    .forHttp("/")
+                    .forStatusCode(200)
+                    .forStatusCode(400)
+            )
             .withExposedPorts(81);
 
     @BeforeEach