Merge branch 'more_fixes' into 'master'

Miscellaneouos fixes around config args, networking, and podman support

See merge request evernym/utilities/devlab!24

Author: absltkaos

devlab_bench/actions/build.py

@@ -87,8 +87,9 @@ def action(images='*', clean=False, no_cache=False, pull=False, skip_pull_images
     if config['network']['name']:
         network_status = docker_obj_status(config['network']['name'], 'network', devlab_bench.helpers.docker.DOCKER, logger=log)[0]
         if network_status['exists'] and not network_status['owned']:
-            log.error("Conflicting custom network found! There is already a docker network defined: '%s' , but is not owned by this project", config['network']['name'])
-            sys.exit(1)
+            if config['network']['name'] != 'host': #This is to allow a project to use the 'host' network
+                log.error("Conflicting custom network found! There is already a docker network defined: '%s' , but is not owned by this project", config['network']['name'])
+                sys.exit(1)
         if not network_status['exists']:
             log.info("Custom user network: '%s' not found. Creating", config['network']['name'])
             docker_helper.create_network(**config['network'])

devlab_bench/actions/up.py

@@ -82,8 +82,9 @@ def action(components='*', skip_provision=False, bind_to_host=False, keep_up_on_
     if config['network']['name']:
         network_status = docker_obj_status(config['network']['name'], 'network', devlab_bench.helpers.docker.DOCKER, logger=log)[0]
         if network_status['exists'] and not network_status['owned']:
-            log.error("Conflicting custom network found! There is already a docker network defined with this name, but is not owned by this project")
-            sys.exit(1)
+            if config['network']['name'] != 'host': #This is to allow a project to use the 'host' network
+                log.error("Conflicting custom network found! There is already a docker network defined with this name, but is not owned by this project")
+                sys.exit(1)
         if not network_status['exists']:
             log.info("Custom user network: '%s' not found. Creating", config['network']['name'])
             devlab_bench.helpers.docker.DOCKER.create_network(**config['network'])

devlab_bench/helpers/command.py

@@ -238,13 +238,16 @@ def run_nowait(self):
         if self.env:
             subprocess_args['env'] = dict(os.environ)
             subprocess_args['env'].update(self.env)
-        cmd_str = ' '.join([self.real_path] + [quote(script_arg) for script_arg in self.args])
+        # Convert all args to str
+        strd_args = [str(script_arg) for script_arg in self.args]
+        # Quote them if use_shell is true
+        cmd_str = ' '.join([self.real_path] + [quote(script_arg) for script_arg in strd_args])
         self.log.debug("Running command: '%s'", cmd_str)
         self.ctime = time.time()
         if self.use_shell:
             self.proc = subprocess.Popen(cmd_str, **subprocess_args)
         else:
-            self.proc = subprocess.Popen([self.real_path] + self.args, **subprocess_args)
+            self.proc = subprocess.Popen([self.real_path] + strd_args, **subprocess_args)
         for strm in (self.proc.stdout, self.proc.stderr):
             if strm is not None:
                 fno = strm.fileno()

devlab_bench/helpers/docker.py

@@ -139,7 +139,7 @@ def build_image(self, name, tag, context, docker_file, apply_filter_label=True,
         else:
             self.log.error("Cannot find docker_file: %s", docker_file)
         return (1, ['Cannot find docker_file: {}'.format(docker_file)])
-    def create_network(self, name, cidr=None, gateway=None, ip_range=None, ipv6=False, driver_opts=None, scope=None, subnet=None, device_name=None, driver='bridge'):
+    def create_network(self, name, cidr=None, gateway=None, ip_range=None, ipv6=False, driver_opts=None, subnet=None, device_name=None, driver='bridge'):
         """
         Create a docker network
 
@@ -152,7 +152,6 @@ def create_network(self, name, cidr=None, gateway=None, ip_range=None, ipv6=Fals
             driver: str, which docker driver to use. Default: 'bridge'
             driver_opts: dict, list of key=value pairs to pass with --opt to 
                 the docker network create command.
-            scope: str, for use with network drivers that require the argument
             subnet: str, CIDR notation for the subnet network (Same argument as cidr)
             device_name: str, specify the exact name of the bridge device for
                 docker to create
@@ -175,8 +174,6 @@ def create_network(self, name, cidr=None, gateway=None, ip_range=None, ipv6=Fals
             opts += ['--ip-range', ip_range]
         if ipv6:
             opts += ['--ipv6=true']
-        if scope:
-            opts += ['--scope', scope]
         if self.labels:
             for label in self.labels:
                 opts += [
@@ -351,7 +348,7 @@ def get_networks(self, return_all=False):
             opts.append('--filter')
             opts.append('label={}'.format(self.filter_label))
         opts.append('--format')
-        opts.append('{{.ID}},{{.Name}},{{.Driver}},{{.Scope}}')
+        opts.append('{{.ID}},{{.Name}},{{.Driver}}')
         cmd_ret = Command(
             self.docker_bin_paths,
             opts,
@@ -360,12 +357,11 @@ def get_networks(self, return_all=False):
         networks = []
         if cmd_ret[0] == 0:
             for nres in cmd_ret[1]:
-                network_id, name, driver, scope = nres.split(',')
+                network_id, name, driver = nres.split(',')
                 networks.append({
                     'id': network_id,
                     'name': name,
                     'driver': driver,
-                    'scope': scope
                 })
             return (cmd_ret[0], networks)
         return cmd_ret