Skip to content

Commit ba5d26b

Browse files
authored
replace deprecated method (#1751)
1 parent e5dea4e commit ba5d26b

File tree

1 file changed

+17
-5
lines changed
  • spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons

1 file changed

+17
-5
lines changed

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,15 @@
2626
import java.time.Duration;
2727
import java.util.Arrays;
2828
import java.util.List;
29+
import java.util.Objects;
2930
import java.util.Optional;
3031
import java.util.concurrent.TimeUnit;
3132

3233
import com.github.dockerjava.api.command.ListImagesCmd;
3334
import com.github.dockerjava.api.command.PullImageCmd;
3435
import com.github.dockerjava.api.command.SaveImageCmd;
36+
import com.github.dockerjava.api.model.Bind;
37+
import com.github.dockerjava.api.model.HostConfig;
3538
import com.github.dockerjava.api.model.Image;
3639
import org.apache.commons.logging.Log;
3740
import org.apache.commons.logging.LogFactory;
@@ -90,9 +93,8 @@ private Commons() {
9093
public static final String TEMP_FOLDER = new File(System.getProperty("java.io.tmpdir")).getAbsolutePath();
9194

9295
private static final K3sContainer CONTAINER = new FixedPortsK3sContainer(DockerImageName.parse(Commons.RANCHER))
93-
.configureFixedPorts(EXPOSED_PORTS)
94-
.withFileSystemBind(TEMP_FOLDER, TEMP_FOLDER)
95-
.withFileSystemBind(TMP_IMAGES, TMP_IMAGES)
96+
.configureFixedPorts()
97+
.addBinds()
9698
.withCommand(Commons.RANCHER_COMMAND)
9799
.withReuse(true);
98100

@@ -331,13 +333,23 @@ private FixedPortsK3sContainer(DockerImageName dockerImageName) {
331333
super(dockerImageName);
332334
}
333335

334-
private FixedPortsK3sContainer configureFixedPorts(int[] ports) {
335-
for (int port : ports) {
336+
private FixedPortsK3sContainer configureFixedPorts() {
337+
for (int port : Commons.EXPOSED_PORTS) {
336338
super.addFixedExposedPort(port, port);
337339
}
338340
return this;
339341
}
340342

343+
private FixedPortsK3sContainer addBinds() {
344+
super.withCreateContainerCmdModifier(cmd -> {
345+
HostConfig hostConfig = Objects.requireNonNull(cmd.getHostConfig());
346+
hostConfig.withBinds(Bind.parse(TEMP_FOLDER + ":" + TEMP_FOLDER),
347+
Bind.parse(TMP_IMAGES + ":" + TMP_IMAGES));
348+
});
349+
350+
return this;
351+
}
352+
341353
}
342354

343355
}

0 commit comments

Comments
 (0)