diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d45f88..987f60f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Fix problem if topology isn't applied correctly - Bump testcontainers to 1.18.0 - Move rocks building in build phase +- Use "addExposedPorts" instead of "withExposedPorts" ## [0.5.4] - 2023-03-31 - Use tarantool image as base instead of centos in cartridge container diff --git a/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java b/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java index b9dd581..4a01f74 100644 --- a/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java +++ b/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java @@ -5,6 +5,7 @@ import org.testcontainers.containers.exceptions.CartridgeTopologyException; import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils; import java.net.URL; import java.util.Arrays; @@ -216,6 +217,16 @@ private static ImageFromDockerfile withBuildArgs(ImageFromDockerfile image, Map< return image; } + public TarantoolCartridgeContainer withFixedExposedPort(int hostPort, int containerPort) { + super.addFixedExposedPort(hostPort, containerPort); + return this; + } + + public TarantoolCartridgeContainer withExposedPort(Integer port) { + super.addExposedPort(port); + return this; + } + private static Map mergeBuildArguments(Map buildArgs) { Map args = new HashMap<>(buildArgs); @@ -463,7 +474,7 @@ protected void configure() { addFixedExposedPort(port, port); } } else { - withExposedPorts(instanceFileParser.getExposablePorts()); + addExposedPorts(ArrayUtils.toPrimitive(instanceFileParser.getExposablePorts())); } } diff --git a/src/main/java/org/testcontainers/containers/TarantoolContainer.java b/src/main/java/org/testcontainers/containers/TarantoolContainer.java index 588d797..2065ab2 100644 --- a/src/main/java/org/testcontainers/containers/TarantoolContainer.java +++ b/src/main/java/org/testcontainers/containers/TarantoolContainer.java @@ -166,6 +166,16 @@ public TarantoolContainer withPort(int port) { return this; } + public TarantoolContainer withFixedExposedPort(int hostPort, int containerPort) { + super.addFixedExposedPort(hostPort, containerPort); + return this; + } + + public TarantoolContainer withExposedPort(Integer port) { + super.addExposedPort(port); + return this; + } + @Override public String getHost() { return host; @@ -349,7 +359,7 @@ protected void configure() { if (useFixedPorts) { addFixedExposedPort(port, port); } else { - withExposedPorts(port); + addExposedPorts(port); } withCommand("tarantool", normalizePath(