Fix Testcontainers regression

(See testcontainers/testcontainers-java#4667)
ArneLimburg · Mar 12, 2022 · fafa863 · fafa863
1 parent eee4189
commit fafa863
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/src/main/java/space/testflight/InContainerDataMySqlContainer.java b/src/main/java/space/testflight/InContainerDataMySqlContainer.java
@@ -20,10 +20,6 @@
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.Ports.Binding;
-
 public class InContainerDataMySqlContainer extends MySQLContainer<InContainerDataMySqlContainer>
   implements DefaultTaggableContainer<InContainerDataMySqlContainer> {
 

diff --git a/src/main/java/space/testflight/InContainerDataPostgreSqlContainer.java b/src/main/java/space/testflight/InContainerDataPostgreSqlContainer.java
@@ -15,15 +15,22 @@
  */
 package space.testflight;
 
+import java.util.logging.Logger;
+
 import org.testcontainers.containers.InternetProtocol;
 import org.testcontainers.containers.PostgreSQLContainer;
 
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.Ports.Binding;
+
 public class InContainerDataPostgreSqlContainer extends PostgreSQLContainer<InContainerDataPostgreSqlContainer>
   implements DefaultTaggableContainer<InContainerDataPostgreSqlContainer> {
 
   public InContainerDataPostgreSqlContainer(String dockerImage) {
     super(dockerImage);
     withEnv("PGDATA", "/var/lib/postgresql/data-local");
+    withExposedPorts(getContainerPort());
     exposeContainerPort();
   }
 
@@ -57,18 +64,19 @@ private void exposeContainerPort() {
 //        exposedPorts.add(containerPort);
 //      }
 //      cmd.withExposedPorts(exposedPorts);
-
-//      Ports ports = cmd.getHostConfig().getPortBindings();
-//      ExposedPort exposedContainerPort = ExposedPort.tcp(getContainerPort());
-//      Binding[] bindings = ports.getBindings().get(exposedContainerPort);
-//      String hostIp = null;
-//      for (Binding binding: bindings) {
-//        hostIp = binding.getHostIp();
-//      }
-//      if (hostIp == null) {
-//        ports.bind(exposedContainerPort, Ports.Binding.empty());
-//        cmd.getHostConfig().withPortBindings(ports);
-//      }
+//
+      Ports ports = cmd.getHostConfig().getPortBindings();
+      ExposedPort exposedContainerPort = ExposedPort.tcp(getContainerPort());
+      Binding[] bindings = ports.getBindings().get(exposedContainerPort);
+      String hostIp = null;
+      for (Binding binding: bindings) {
+        hostIp = binding.getHostIp();
+      }
+      if (hostIp == null) {
+        ports.bind(exposedContainerPort, Ports.Binding.empty());
+        cmd.getHostConfig().withPortBindings(ports);
+      }
+      Logger.getLogger("HostConfig").info("HostConfig=" + cmd.getHostConfig());
     });
   }
 }