Skip to content

Commit 7fb509c

Browse files
committed
only do caching on ecr
1 parent a916c53 commit 7fb509c

File tree

1 file changed

+25
-16
lines changed

1 file changed

+25
-16
lines changed

scripts/release/build/image_build_process.py

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -170,22 +170,7 @@ def execute_docker_build(
170170
# Convert build args to the format expected by python_on_whales
171171
build_args = {k: str(v) for k, v in args.items()}
172172

173-
registry_name = tag.split(":")[0] if ":" in tag else tag
174-
# e.g., "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes" -> "mongodb-kubernetes"
175-
cache_image_name = registry_name.split("/")[-1]
176-
177-
# Base cache repository name
178-
base_cache_repo = f"dev/cache/{cache_image_name}"
179-
180-
# Build branch/arch-scoped cache configuration
181-
base_registry = f"268558157000.dkr.ecr.us-east-1.amazonaws.com/{base_cache_repo}"
182-
183-
# TODO CLOUDP-335471: use env variables to configure AWS region and account ID
184-
cache_from_refs, cache_to_refs = build_cache_configuration(
185-
base_registry
186-
)
187-
188-
# ensure_ecr_cache_repository(base_cache_repo)
173+
cache_from_refs, cache_to_refs = _build_cache(tags)
189174

190175
logger.info(f"Building image: {tags}")
191176
logger.info(f"Platforms: {platforms}")
@@ -223,3 +208,27 @@ def execute_docker_build(
223208
except Exception as e:
224209
logger.error(f"Failed to build image {tags}: {e}")
225210
raise RuntimeError(f"Failed to build image {tags}: {str(e)}")
211+
212+
213+
def _build_cache(tags):
214+
# Filter tags to only include ECR ones (containing ".dkr.ecr.")
215+
ecr_tags = [tag for tag in tags if ".dkr.ecr." in tag]
216+
if not ecr_tags:
217+
return [], {}
218+
primary_tag = ecr_tags[0]
219+
# Extract the repository URL without tag (e.g., "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes:1.0.0" -> "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes")
220+
repository_url = primary_tag.split(":")[0] if ":" in primary_tag else primary_tag
221+
# Extract just the image name from the repository URL (e.g., "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes" -> "mongodb-kubernetes")
222+
cache_image_name = repository_url.split("/")[-1]
223+
# Base cache repository name
224+
base_cache_repo = f"dev/cache/{cache_image_name}"
225+
# Build branch/arch-scoped cache configuration
226+
base_registry = f"268558157000.dkr.ecr.us-east-1.amazonaws.com/{base_cache_repo}"
227+
228+
ensure_ecr_cache_repository(base_cache_repo)
229+
230+
# TODO CLOUDP-335471: use env variables to configure AWS region and account ID
231+
cache_from_refs, cache_to_refs = build_cache_configuration(
232+
base_registry
233+
)
234+
return cache_from_refs, cache_to_refs

0 commit comments

Comments
 (0)