Merge branch 'develop' into chzheng/docker_image_flag

Author: ycchenzheng

.github/CODEOWNERS

@@ -1,2 +1,2 @@
-* @Obliviour @44past4 @sharabiani @pawloch00 @BluValor @gcie @RoshaniN
+* @Obliviour @44past4 @sharabiani @pawloch00 @BluValor @gcie @RoshaniN @scaliby @jamOne- @SikaGrr @FIoannides @fatoshoti
 slice/ @mwysokin @mimowo @gabesaba @PBundyra @mwielgus @pajakd

src/xpk/core/docker_image.py

@@ -26,6 +26,7 @@
 DEFAULT_DOCKER_IMAGE = 'python:3.10'
 DEFAULT_SCRIPT_DIR = os.getcwd()
 PLATFORM = 'linux/amd64'
+CLOUD_PREFIXES = ['gcr.io', 'docker.pkg.dev', 'us-docker.pkg.dev']
 
 
 def validate_docker_image(docker_image, args) -> int:
@@ -223,18 +224,18 @@ def setup_docker_image(args) -> tuple[int, str]:
   """
 
   docker_image = args.docker_image
-  if not docker_image or docker_image == DEFAULT_DOCKER_IMAGE:
+
+  if not docker_image and args.base_docker_image:
     docker_image = args.base_docker_image  # fallback for legacy users
 
-  if not docker_image or docker_image == DEFAULT_DOCKER_IMAGE:
+  if not docker_image:
     xpk_print(
-        'Error: No docker image specified. Please provide --docker-image.'
+        f'No docker image specified, using default: {DEFAULT_DOCKER_IMAGE}'
     )
-    xpk_exit(1)
+    docker_image = DEFAULT_DOCKER_IMAGE
 
-  cloud_prefixes = ['gcr.io', 'docker.pkg.dev', 'us-docker.pkg.dev']
   is_cloud_image = any(
-      docker_image.startswith(prefix) for prefix in cloud_prefixes
+      docker_image.startswith(prefix) for prefix in CLOUD_PREFIXES
   )
 
   if is_cloud_image: