From 4ad2b7c45853adc812a90180efd14399781b46d1 Mon Sep 17 00:00:00 2001
From: ldericher <jmmiehe@gmx.de>
Date: Mon, 17 Aug 2020 14:13:42 +0200
Subject: [PATCH] use new utils.project routines

---
 src/kiwi/subcommands/utils/dockercommand.py | 21 ++++++++++-----------
 src/kiwi/subcommands/utils/executable.py    | 10 ++++------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/kiwi/subcommands/utils/dockercommand.py b/src/kiwi/subcommands/utils/dockercommand.py
index b2738e0..34cf42a 100644
--- a/src/kiwi/subcommands/utils/dockercommand.py
+++ b/src/kiwi/subcommands/utils/dockercommand.py
@@ -5,27 +5,26 @@ import subprocess
 
 # local
 from .executable import Executable
+from .project import *
 
 
 def _update_kwargs(config, args, **kwargs):
-    if args is not None and 'projects' in args and args.projects is not None:
-        # command affects a project in this instance
-
-        project_name = args.projects
-        if isinstance(project_name, list) and len(project_name) > 0:
-            project_name = project_name[0]
-
-        project_marker = config['markers:project']
-        project_dir = f'{project_name}{project_marker}'
-        kwargs['cwd'] = project_dir
+    # project given in args: command affects a project in this instance
+    project_name = get_project_name(args)
+    if project_name is not None:
+        # execute command in project directory
+        kwargs['cwd'] = get_project_dir(config, project_name)
 
+        # ensure there is an environment
         if 'env' not in kwargs:
             kwargs['env'] = {}
 
+        # create environment variables for docker commands
         kwargs['env'].update({
             'COMPOSE_PROJECT_NAME': project_name,
+            'KIWI_HUB_NAME': config['network:name'],
             'CONFDIR': os.path.join(config['runtime:storage'], 'conf'),
-            'TARGETDIR': os.path.join(config['runtime:storage'], project_dir)
+            'TARGETDIR': os.path.join(config['runtime:storage'], get_project_dir(config, project_name))
         })
 
         logging.debug(f"kwargs updated: {kwargs}")
diff --git a/src/kiwi/subcommands/utils/executable.py b/src/kiwi/subcommands/utils/executable.py
index 5c04fc8..e1116ad 100644
--- a/src/kiwi/subcommands/utils/executable.py
+++ b/src/kiwi/subcommands/utils/executable.py
@@ -6,15 +6,13 @@ import subprocess
 
 def _update_kwargs(config, **kwargs):
     if config is not None:
-        if config['runtime:env'] is not None:
-            kwargs['env'].update(config['runtime:env'])
-
+        # ensure there is an environment
         if 'env' not in kwargs:
             kwargs['env'] = {}
 
-        kwargs['env'].update({
-            'KIWI_HUB_NAME': config['network:name']
-        })
+        # add common environment from config
+        if config['runtime:env'] is not None:
+            kwargs['env'].update(config['runtime:env'])
 
         logging.debug(f"kwargs updated: {kwargs}")