Merge pull request Azure#2 from magnus-longva-bouvet/patch-2

fixed prepare_source_location args
magnus-longva-bouvet · Jun 7, 2022 · ba1cea6 · ba1cea6
2 parents 63b2626 + 0cd346d
commit ba1cea6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/azure-cli/azure/cli/command_modules/acr/_utils.py b/src/azure-cli/azure/cli/command_modules/acr/_utils.py
@@ -410,7 +410,7 @@ def prepare_source_location(cmd,
                             client_registries,
                             registry_name,
                             resource_group_name,
-                            docker_file_path):
+                            docker_file_path=None):
     if not source_location or source_location.lower() == ACR_NULL_CONTEXT:
         source_location = None
     elif os.path.exists(source_location):

diff --git a/src/azure-cli/azure/cli/command_modules/acr/run.py b/src/azure-cli/azure/cli/command_modules/acr/run.py
@@ -53,7 +53,7 @@ def acr_run(cmd,  # pylint: disable=too-many-locals
 
     client_registries = cf_acr_registries_tasks(cmd.cli_ctx)
     source_location = prepare_source_location(
-        cmd, source_location, client_registries, registry_name, resource_group_name)
+        cmd, source_location, client_registries, registry_name, resource_group_name, file)
 
     platform_os, platform_arch, platform_variant = get_validate_platform(cmd, platform)
 

diff --git a/src/azure-cli/azure/cli/command_modules/acr/task.py b/src/azure-cli/azure/cli/command_modules/acr/task.py
@@ -880,10 +880,10 @@ def acr_task_run(cmd,  # pylint: disable=too-many-locals
     context_path = prepare_source_location(
         cmd,
         context_path,
-        file,
         client_registries,
         registry_name,
-        resource_group_name
+        resource_group_name,
+        file
     )
 
     timeout = None