Merge docker env changes

Author: amd-arsuresh

automation/script/docker.py

@@ -429,15 +429,19 @@ def docker_run(self_module, i):
         return r
     final_run_cmd = f"""{r['run_cmd_string']} {container_env_string} --docker_run_deps """
 
+
     # Execute the Docker container
     mlc_docker_input = {
         'action': 'run', 'target': 'script', 'tags': 'run,docker,container',
         'rebuild': rebuild_docker_image,
         'env': env, 'mounts': mounts,
         'script_tags': i.get('tags'), 'run_cmd': final_run_cmd,
-        'quiet': True, 'real_run': True, 'add_deps_recursive': {'build-docker-image': {'dockerfile': dockerfile_path}},
-        **docker_inputs
+        'quiet': True, 'real_run': True, 'add_deps_recursive': {'build-docker-image': {'dockerfile': dockerfile_path}}
     }
+    utils.merge_dicts({'dict1': mlc_docker_input,
+                        'dict2': docker_inputs,
+                        'append_lists': True,
+                        'append_unique': True})
 
     r = self_module.action_object.access(mlc_docker_input)
     if r['return'] > 0:

script/build-docker-image/customize.py

@@ -21,6 +21,12 @@ def preprocess(i):
 
     MLC_DOCKER_BUILD_ARGS = env.get('+ MLC_DOCKER_BUILD_ARGS', [])
 
+
+    if not is_false(env.get('MLC_DOCKER_USE_HOST_USER_ID')) and os.name != 'nt' and "UID=\" $(id -u $USER) \"" not in MLC_DOCKER_BUILD_ARGS:
+        MLC_DOCKER_BUILD_ARGS.append(f"UID=\" $(id -u $USER) \"")
+    if not is_false(env.get('MLC_DOCKER_USE_HOST_GROUP_ID')) and os.name != 'nt' and "GID=\" $(id -g $USER) \"" not in MLC_DOCKER_BUILD_ARGS:
+        MLC_DOCKER_BUILD_ARGS.append(f"GID=\" $(id -g $USER) \"")
+
     if env.get('MLC_GH_TOKEN', '') != '':
         MLC_DOCKER_BUILD_ARGS.append("MLC_GH_TOKEN=" + env['MLC_GH_TOKEN'])
 

script/run-docker-container/meta.yaml

@@ -45,6 +45,8 @@ input_mapping:
   interactive: MLC_DOCKER_INTERACTIVE_MODE
   it: MLC_DOCKER_INTERACTIVE
   mounts: MLC_DOCKER_VOLUME_MOUNTS
+  use_host_user_id: MLC_DOCKER_USE_HOST_USER_ID
+  use_host_group_id: MLC_DOCKER_USE_HOST_GROUP_ID
   pass_user_id: MLC_DOCKER_PASS_USER_ID
   pass_user_group: MLC_DOCKER_PASS_USER_GROUP
   port_maps: MLC_DOCKER_PORT_MAPS