Skip to content

Commit d195bc3

Browse files
committed
Fix #34029: allow specifying container-network for all apps
1 parent f53a952 commit d195bc3

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,18 @@
7373
public class DockerEngineBackend extends AbstractDockerBackend {
7474

7575
private static final String PROPERTY_IMG_PULL_POLICY = "image-pull-policy";
76+
private static final String PROPERTY_CONTAINER_NETWORK = "default-container-network";
7677

7778
private ImagePullPolicy imagePullPolicy;
7879
private String nonInternalNetworkTargetProtocol;
7980
private URL hostURL;
81+
private String containerNetwork;
8082

8183
@PostConstruct
8284
public void initialize() {
8385
super.initialize();
8486
imagePullPolicy = environment.getProperty(getPropertyPrefix() + PROPERTY_IMG_PULL_POLICY, ImagePullPolicy.class, ImagePullPolicy.IfNotPresent);
87+
containerNetwork = environment.getProperty(getPropertyPrefix() + PROPERTY_CONTAINER_NETWORK);
8588

8689
try {
8790
hostURL = new URL(getProperty(PROPERTY_URL, DEFAULT_TARGET_URL));
@@ -130,7 +133,11 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
130133
hostConfigBuilder.cpuQuota(quota);
131134
}
132135

133-
spec.getNetwork().ifPresent(hostConfigBuilder::networkMode);
136+
if (spec.getNetwork().isPresent()) {
137+
hostConfigBuilder.networkMode(spec.getNetwork().getValueAsString());
138+
} else if (containerNetwork != null) {
139+
hostConfigBuilder.networkMode(containerNetwork);
140+
}
134141
spec.getDns().ifPresent(hostConfigBuilder::dns);
135142
spec.getVolumes().ifPresent(hostConfigBuilder::binds);
136143
hostConfigBuilder.privileged(isPrivileged() || spec.isPrivileged());

0 commit comments

Comments
 (0)