From a225c60b255d25267eaa67a4611e8e0481b21ea9 Mon Sep 17 00:00:00 2001 From: Vlad Lyutenko Date: Sun, 18 Sep 2022 18:39:17 +0200 Subject: [PATCH] Fix for method exposing port on local environment This fix prevents loosing ports, which could be added as exposed, between call this method and actual execution of applying override rules --- .../java/io/trino/testing/containers/TestContainers.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java index 7044e1b8686b..cdbce606315b 100644 --- a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java +++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/TestContainers.java @@ -16,7 +16,6 @@ import com.github.dockerjava.api.model.ExposedPort; import com.github.dockerjava.api.model.PortBinding; -import com.google.common.collect.ImmutableList; import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.TestcontainersConfiguration; @@ -69,12 +68,10 @@ public static void exposeFixedPorts(GenericContainer container) "This method is supposed to be invoked from local development helpers only e.g. QueryRunner.main(), " + "hence it should never run on CI"); - ImmutableList portBindings = container.getExposedPorts().stream() - .map(exposedPort -> new PortBinding(bindPort(exposedPort), new ExposedPort(exposedPort))) - .collect(toImmutableList()); - container.withCreateContainerCmdModifier(cmd -> cmd .withHostConfig(requireNonNull(cmd.getHostConfig(), "hostConfig is null") - .withPortBindings(portBindings))); + .withPortBindings(container.getExposedPorts().stream() + .map(exposedPort -> new PortBinding(bindPort(exposedPort), new ExposedPort(exposedPort))) + .collect(toImmutableList())))); } }