Ref #34029: support default-container-network in swarm

Author: LEDfan

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

@@ -58,11 +58,13 @@ public abstract class AbstractDockerBackend extends AbstractContainerBackend {
     protected static final String PROPERTY_PORT_RANGE_MAX = "port-range-max";
     protected static final String PROPERTY_TARGET_URL = "target-url";
     protected static final String DEFAULT_TARGET_URL = DEFAULT_TARGET_PROTOCOL + "://localhost";
+    protected static final String PROPERTY_CONTAINER_NETWORK = "default-container-network";
     private static final String PROPERTY_PREFIX = "proxy.docker.";
     @Inject
     protected IPortAllocator portAllocator;
     protected DockerClient dockerClient;
 
+    protected String containerNetwork;
     protected Integer portRangeFrom;
     protected Integer portRangeTo;
     protected String nonInternalNetworkTargetProtocol;
@@ -100,6 +102,7 @@ public void initialize() throws ContainerProxyException {
         }
 
         dockerClient = builder.build();
+        containerNetwork = environment.getProperty(getPropertyPrefix() + PROPERTY_CONTAINER_NETWORK);
         portRangeFrom = environment.getProperty(getPropertyPrefix() + PROPERTY_PORT_RANGE_START, Integer.class, 20000);
         portRangeTo = environment.getProperty(getPropertyPrefix() + PROPERTY_PORT_RANGE_MAX, Integer.class, -1);
 

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

@@ -75,21 +75,18 @@
 public class DockerEngineBackend extends AbstractDockerBackend {
 
     private static final String PROPERTY_IMG_PULL_POLICY = "image-pull-policy";
-    private static final String PROPERTY_CONTAINER_NETWORK = "default-container-network";
     private static final String PROPERTY_LOKI_URL = "loki-url";
     private static final String PROPERTY_TARGET_BIND_IP = "target-bind-ip";
     private static final String DEFAULT_TARGET_BIND_IP = "127.0.0.1";
 
     private ImagePullPolicy imagePullPolicy;
-    private String containerNetwork;
     private String lokiUrl;
     private String nonInternalTargetBindIp;
 
     @PostConstruct
     public void initialize() {
         super.initialize();
         imagePullPolicy = environment.getProperty(getPropertyPrefix() + PROPERTY_IMG_PULL_POLICY, ImagePullPolicy.class, ImagePullPolicy.IfNotPresent);
-        containerNetwork = environment.getProperty(getPropertyPrefix() + PROPERTY_CONTAINER_NETWORK);
         lokiUrl = environment.getProperty(getPropertyPrefix() + PROPERTY_LOKI_URL);
         nonInternalTargetBindIp = environment.getProperty(getPropertyPrefix() + PROPERTY_TARGET_BIND_IP, DEFAULT_TARGET_BIND_IP);
     }

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

@@ -143,6 +143,8 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
 
             if (spec.getNetwork().isPresent()) {
                 networks.add(NetworkAttachmentConfig.builder().target(spec.getNetwork().getValue()).build());
+            } else if (containerNetwork != null) {
+                networks.add(NetworkAttachmentConfig.builder().target(containerNetwork).build());
             }
 
             Reservations.Builder reservationsBuilder = Reservations.builder();