Skip to content

Commit 046335e

Browse files
ArtDudkasimovskiy
andauthored
Use add exposed ports instead of set exposed ports (#76)
It's needed when you want to use not only default ports. For example it's usefull when you use metrics for TarantoolContainer. Also add exposedPorts methods to use them in init chain. Co-authored-by: Dmitry Kasimovskiy <98410443+dkasimovskiy@users.noreply.github.com>
1 parent d6f21a6 commit 046335e

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- Fix problem if topology isn't applied correctly
55
- Bump testcontainers to 1.18.0
66
- Move rocks building in build phase
7+
- Use "addExposedPorts" instead of "withExposedPorts"
78

89
## [0.5.4] - 2023-03-31
910
- Use tarantool image as base instead of centos in cartridge container

src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import org.testcontainers.containers.exceptions.CartridgeTopologyException;
77
import org.testcontainers.images.builder.ImageFromDockerfile;
8+
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
89

910
import java.net.URL;
1011
import java.util.Arrays;
@@ -216,6 +217,16 @@ private static ImageFromDockerfile withBuildArgs(ImageFromDockerfile image, Map<
216217
return image;
217218
}
218219

220+
public TarantoolCartridgeContainer withFixedExposedPort(int hostPort, int containerPort) {
221+
super.addFixedExposedPort(hostPort, containerPort);
222+
return this;
223+
}
224+
225+
public TarantoolCartridgeContainer withExposedPort(Integer port) {
226+
super.addExposedPort(port);
227+
return this;
228+
}
229+
219230
private static Map<String, String> mergeBuildArguments(Map<String, String> buildArgs) {
220231
Map<String, String> args = new HashMap<>(buildArgs);
221232

@@ -463,7 +474,7 @@ protected void configure() {
463474
addFixedExposedPort(port, port);
464475
}
465476
} else {
466-
withExposedPorts(instanceFileParser.getExposablePorts());
477+
addExposedPorts(ArrayUtils.toPrimitive(instanceFileParser.getExposablePorts()));
467478
}
468479
}
469480

src/main/java/org/testcontainers/containers/TarantoolContainer.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,16 @@ public TarantoolContainer withPort(int port) {
166166
return this;
167167
}
168168

169+
public TarantoolContainer withFixedExposedPort(int hostPort, int containerPort) {
170+
super.addFixedExposedPort(hostPort, containerPort);
171+
return this;
172+
}
173+
174+
public TarantoolContainer withExposedPort(Integer port) {
175+
super.addExposedPort(port);
176+
return this;
177+
}
178+
169179
@Override
170180
public String getHost() {
171181
return host;
@@ -349,7 +359,7 @@ protected void configure() {
349359
if (useFixedPorts) {
350360
addFixedExposedPort(port, port);
351361
} else {
352-
withExposedPorts(port);
362+
addExposedPorts(port);
353363
}
354364

355365
withCommand("tarantool", normalizePath(

0 commit comments

Comments
 (0)