Support --docker_mlc_repo_path

Author: amd-arsuresh

automation/script/docker.py

@@ -173,7 +173,7 @@ def dockerfile(self_module, input_params):
         comments = []
 
     # Push Docker image if specified
-    if input_params.get('docker_push_image') in [True, 'True', 'yes']:
+    if str(input_params.get('docker_push_image')).lower() in [ 'true', 'yes', '1']:
         env['MLC_DOCKER_PUSH_IMAGE'] = 'yes'
 
     dockerfile_env = docker_inputs.get('env', {})
@@ -191,6 +191,10 @@ def dockerfile(self_module, input_params):
         'quiet': True, 'real_run': True
     }
 
+    if docker_inputs.get('mlc_repo_path', '') != '':
+        mlc_docker_input['mlc_repo_path'] = docker_inputs['mlc_repo_path']
+    
+
     docker_v = False
     docker_s = False
     if is_true(input_params.get(

automation/script/docker_utils.py

@@ -136,7 +136,7 @@ def prepare_docker_inputs(input_params, docker_settings,
     """
 
     keys = [
-        "mlc_repo", "mlc_repo_branch", "base_image", "os", "os_version",
+        "mlc_repo", "mlc_repo_branch", "base_image", "os", "os_version", "mlc_repo_path",
         "mlc_repos", "skip_mlc_sys_upgrade", "extra_sys_deps", "image_name",
         "gh_token", "fake_run_deps", "run_final_cmds", "real_run", "copy_files", "path", "user", "env", "build_env"
     ]

script/build-dockerfile/customize.py

@@ -87,8 +87,9 @@ def preprocess(i):
                     "Dockerfile")))
         os.makedirs(build_context_dir, exist_ok=True)
 
+        repo_name = os.path.basename(mlc_repo_path)
         # Create mlc_repo directory relative to the build context
-        repo_build_context_path = os.path.join(build_context_dir, "mlc_repo")
+        repo_build_context_path = os.path.join(build_context_dir, "mlc_repo", repo_name)
 
         # Remove existing directory if it exists
         if os.path.exists(repo_build_context_path):
@@ -309,8 +310,8 @@ def preprocess(i):
 
     docker_use_virtual_python = env.get('MLC_DOCKER_USE_VIRTUAL_PYTHON', "yes")
     if not is_false(docker_use_virtual_python):
-        f.write('RUN {} -m venv $HOME/venv/mlc'.format(python) + " " + EOL)
-        f.write('ENV PATH="$HOME/venv/mlc/bin:$PATH"' + EOL)
+        f.write('RUN {} -m venv $HOME/venv/mlcflow'.format(python) + " " + EOL)
+        f.write('ENV PATH="$HOME/venv/mlcflow/bin:$PATH"' + EOL)
     # f.write('RUN . /opt/venv/mlc/bin/activate' + EOL)
 
     f.write('ENV PATH="$PATH:$HOME/.local/bin"' + EOL)
@@ -328,22 +329,27 @@ def preprocess(i):
         EOL)
 
     f.write(EOL + '# Download MLC repo for scripts' + EOL)
-    pat = env.get('MLC_GH_TOKEN')
-    if pat:
+    pat = env.get('MLC_GH_TOKEN', '')
+    
+    if pat != '':
         token_string = f" --pat={pat}"
     else:
         token_string = ""
 
     if use_copy_repo:
-        docker_repo_dest = "$HOME/MLC/repos/mlcommons@mlperf-automations"
+        repo_name = os.path.basename(relative_repo_path)
+        docker_repo_dest = f"$HOME/MLC/repos/{repo_name}"
         f.write(
-            f'COPY --chown=mlcuser:mlc {relative_repo_path} {docker_repo_dest}' +
+            f'COPY --chown={docker_user}:{docker_group} {relative_repo_path} {docker_repo_dest}' +
             EOL)
 
         f.write(EOL + '# Register MLC repository' + EOL)
         f.write(
-            'RUN mlc pull repo --url={} {token_string} --quiet'.format(docker_repo_dest) +
+            'RUN mlc add repo {} --quiet'.format(docker_repo_dest) +
             EOL)
+        #f.write(
+        #    'RUN mlc pull repo --url={} {} --quiet'.format(docker_repo_dest, token_string) +
+        #    EOL)
         f.write(EOL)
 
     else:

script/build-dockerfile/meta.yaml

@@ -45,6 +45,7 @@ input_mapping:
   gh_token: MLC_GH_TOKEN
   image_repo: MLC_DOCKER_IMAGE_REPO
   image_tag: MLC_DOCKER_IMAGE_TAG
+  mlc_repo_path: MLC_REPO_PATH
   package_manager_update_cmd: MLC_PACKAGE_MANAGER_UPDATE_CMD
   pip_extra_flags: MLC_DOCKER_PIP_INSTALL_EXTRA_FLAGS
   post_file: DOCKER_IMAGE_POST_FILE