From deea052b0790a71361adaa7f272f51e31a0dd430 Mon Sep 17 00:00:00 2001
From: Donald Morton <donald.morton@graylog.com>
Date: Wed, 22 Sep 2021 08:28:05 -0500
Subject: [PATCH 1/3] Update testcontainers to 1.16.0.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f654c4ea80a..67b62e8d132c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
         <nosqlunit.version>1.0.0-rc.5</nosqlunit.version>
         <restassured.version>4.3.1</restassured.version>
         <system-rules.version>1.19.0</system-rules.version>
-        <testcontainers.version>1.15.2</testcontainers.version>
+        <testcontainers.version>1.16.0</testcontainers.version>
 
         <!-- Nodejs dependencies -->
         <nodejs.version>v14.15.4</nodejs.version>

From 8a15eddf47e5d0d577d296f1c65bbd6a9095a4b5 Mon Sep 17 00:00:00 2001
From: Donald Morton <donald.morton@graylog.com>
Date: Wed, 22 Sep 2021 09:52:01 -0500
Subject: [PATCH 2/3] Declare exposed ports for OpenLDAP container.

---
 .../test/java/org/graylog/testing/ldap/OpenLDAPContainer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java b/graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java
index 2691cefa5b45..0c7a32a4b046 100644
--- a/graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java
+++ b/graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java
@@ -55,7 +55,8 @@ public static OpenLDAPContainer createWithTLS() {
                 .withFileSystemBind(LDAPTestUtils.testTLSCertsPath("server-cert.pem"), CONTAINER_CERTS_PATH + "/server-cert.pem", BindMode.READ_ONLY)
                 .withFileSystemBind(LDAPTestUtils.testTLSCertsPath("server-key.pem"), CONTAINER_CERTS_PATH + "/server-key.pem", BindMode.READ_ONLY)
                 .withFileSystemBind(LDAPTestUtils.testTLSCertsPath("CA-cert.pem"), CONTAINER_CERTS_PATH + "/CA-cert.pem", BindMode.READ_ONLY)
-                .withFileSystemBind(LDAPTestUtils.testTLSCertsPath("dhparam.pem"), CONTAINER_CERTS_PATH + "/dhparam.pem", BindMode.READ_ONLY);
+                .withFileSystemBind(LDAPTestUtils.testTLSCertsPath("dhparam.pem"), CONTAINER_CERTS_PATH + "/dhparam.pem", BindMode.READ_ONLY)
+                .withExposedPorts(TLS_PORT);
     }
 
     public OpenLDAPContainer() {
@@ -74,6 +75,7 @@ public OpenLDAPContainer() {
         withNetwork(Network.newNetwork());
         withNetworkAliases("openldap");
         withStartupTimeout(Duration.ofSeconds(10));
+        withExposedPorts(PORT);
     }
 
     /**

From db304979480387a616e2358bd2eed858a317db63 Mon Sep 17 00:00:00 2001
From: Donald Morton <donald.morton@graylog.com>
Date: Thu, 23 Sep 2021 08:00:32 -0500
Subject: [PATCH 3/3] Update
 graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java

Co-authored-by: Bernd Ahlers <bernd@users.noreply.github.com>
---
 .../test/java/org/graylog/testing/ldap/OpenLDAPContainer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java b/graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java
index 0c7a32a4b046..0342ae5478e3 100644
--- a/graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java
+++ b/graylog2-server/src/test/java/org/graylog/testing/ldap/OpenLDAPContainer.java
@@ -56,7 +56,7 @@ public static OpenLDAPContainer createWithTLS() {
                 .withFileSystemBind(LDAPTestUtils.testTLSCertsPath("server-key.pem"), CONTAINER_CERTS_PATH + "/server-key.pem", BindMode.READ_ONLY)
                 .withFileSystemBind(LDAPTestUtils.testTLSCertsPath("CA-cert.pem"), CONTAINER_CERTS_PATH + "/CA-cert.pem", BindMode.READ_ONLY)
                 .withFileSystemBind(LDAPTestUtils.testTLSCertsPath("dhparam.pem"), CONTAINER_CERTS_PATH + "/dhparam.pem", BindMode.READ_ONLY)
-                .withExposedPorts(TLS_PORT);
+                .withExposedPorts(PORT, TLS_PORT);
     }
 
     public OpenLDAPContainer() {