Fix #959

apache · Nov 27, 2023 · 152156b · 152156b
1 parent 7964206
commit 152156b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
@@ -56,11 +56,12 @@ public class DockerService extends DockerServiceUtils {
 
     private static final Logger LOGGER = Logger.getLogger(DockerService.class.getName());
 
-    protected static final String NETWORK_NAME = "karavan";
-
     @ConfigProperty(name = "karavan.environment")
     String environment;
 
+    @ConfigProperty(name = "karavan.docker.network")
+    String networkName;
+
     @Inject
     DockerEventListener dockerEventListener;
 
@@ -117,16 +118,16 @@ public void stopListeners() throws IOException {
 
     public void createNetwork() {
         if (!getDockerClient().listNetworksCmd().exec().stream()
-                .filter(n -> n.getName().equals(NETWORK_NAME))
+                .filter(n -> n.getName().equals(networkName))
                 .findFirst().isPresent()) {
             CreateNetworkResponse res = getDockerClient().createNetworkCmd()
-                    .withName(NETWORK_NAME)
+                    .withName(networkName)
                     .withDriver("bridge")
                     .withInternal(false)
                     .withAttachable(true).exec();
-            LOGGER.info("Network created: " + NETWORK_NAME);
+            LOGGER.info("Network created: " + networkName);
         } else {
-            LOGGER.info("Network already exists with name: " + NETWORK_NAME);
+            LOGGER.info("Network already exists with name: " + networkName);
         }
     }
 
@@ -177,7 +178,7 @@ public Container createContainerFromCompose(DockerComposeService compose, Map<St
             }
 
             return createContainer(compose.getContainer_name(), compose.getImage(),
-                    env, compose.getPortsMap(), healthCheck, labels, Map.of(), NETWORK_NAME, restartPolicy);
+                    env, compose.getPortsMap(), healthCheck, labels, Map.of(), networkName, restartPolicy);
 
         } else {
             LOGGER.info("Compose Service already exists: " + containers.get(0).getId());
@@ -219,7 +220,7 @@ public Container createContainer(String name, String image, List<String> env, Ma
                             .withRestartPolicy(restartPolicy)
                     .withPortBindings(portBindings)
                     .withMounts(mounts)
-                    .withNetworkMode(network != null ? network : NETWORK_NAME));
+                    .withNetworkMode(network != null ? network : networkName));
 
             CreateContainerResponse response = createContainerCmd.exec();
             LOGGER.info("Container created: " + response.getId());

diff --git a/karavan-web/karavan-app/src/main/resources/application.properties b/karavan-web/karavan-app/src/main/resources/application.properties
@@ -29,6 +29,8 @@ karavan.container.statistics.interval=10s
 karavan.devmode.image=ghcr.io/apache/camel-karavan-devmode:4.1.0
 karavan.maven.cache=
 
+karavan.docker.network=karavan
+
 # Git repository Configuration
 karavan.git-repository=http://gitea:3000/karavan/karavan.git
 karavan.git-username=karavan