tweaks for external network name for docker-compose editing, idaholab…

…#473
mmguero-dev · Jul 18, 2024 · 59b3240 · 59b3240
1 parent 75d9caf
commit 59b3240
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -1383,8 +1383,8 @@ services:
     labels:
       traefik.enable: false
 
-# shared named volume so filebeat can access nginx access logs
 volumes:
+  # shared named volume so filebeat can access nginx access logs
   nginx-log-path:
 
 networks:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1242,8 +1242,8 @@ services:
     labels:
       traefik.enable: false
 
-# shared named volume so filebeat can access nginx access logs
 volumes:
+  # shared named volume so filebeat can access nginx access logs
   nginx-log-path:
 
 networks:

diff --git a/scripts/install.py b/scripts/install.py
@@ -2339,9 +2339,10 @@ def tweak_malcolm_runtime(self, malcolm_install_path):
                     # re-write the network definition from scratch
                     if 'networks' in data:
                         del data['networks']
-                    networkDef = {'external': True if (len(dockerNetworkExternalName) > 0) else False}
+                    networkDef = {}
+                    networkDef['external'] = bool(len(dockerNetworkExternalName) > 0)
                     if len(dockerNetworkExternalName) > 0:
-                        networkDef['name']: dockerNetworkExternalName
+                        networkDef['name'] = dockerNetworkExternalName
                     data['networks'] = {}
                     data['networks']['default'] = networkDef