Merge branch 'develop' into chzheng/docker_image_flag

ycchenzheng · ycchenzheng · commit 95e6fa03b648 · 2025-08-11T01:04:23.000Z
diff --git a/.github/CODEOWNERS b/.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
diff --git a/src/xpk/core/docker_image.py b/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:
@@ -232,9 +233,8 @@ def setup_docker_image(args) -> tuple[int, str]:
     )
     xpk_exit(1)
 
-  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:

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-* @Obliviour @44past4 @sharabiani @pawloch00 @BluValor @gcie @RoshaniN`
	`1`	`+* @Obliviour @44past4 @sharabiani @pawloch00 @BluValor @gcie @RoshaniN @scaliby @jamOne- @SikaGrr @FIoannides @fatoshoti`
`2`	`2`	`slice/ @mwysokin @mimowo @gabesaba @PBundyra @mwielgus @pajakd`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`DEFAULT_DOCKER_IMAGE = 'python:3.10'`
`27`	`27`	`DEFAULT_SCRIPT_DIR = os.getcwd()`
`28`	`28`	`PLATFORM = 'linux/amd64'`
	`29`	`+CLOUD_PREFIXES = ['gcr.io', 'docker.pkg.dev', 'us-docker.pkg.dev']`
`29`	`30`
`30`	`31`
`31`	`32`	`def validate_docker_image(docker_image, args) -> int:`
`@@ -232,9 +233,8 @@ def setup_docker_image(args) -> tuple[int, str]:`
`232`	`233`	`)`
`233`	`234`	`xpk_exit(1)`
`234`	`235`
`235`		`- cloud_prefixes = ['gcr.io', 'docker.pkg.dev', 'us-docker.pkg.dev']`
`236`	`236`	`is_cloud_image = any(`
`237`		`- docker_image.startswith(prefix) for prefix in cloud_prefixes`
	`237`	`+ docker_image.startswith(prefix) for prefix in CLOUD_PREFIXES`
`238`	`238`	`)`
`239`	`239`
`240`	`240`	`if is_cloud_image:`