Skip to content

Commit 7c0257f

Browse files
committed
rename to plural
1 parent 0c5644e commit 7c0257f

File tree

6 files changed

+57
-55
lines changed

6 files changed

+57
-55
lines changed

scripts/release/atomic_pipeline.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def build_image(
5353
span.set_attribute("mck.platforms", build_configuration.platforms)
5454

5555
# Build the image once with all repository tags
56-
all_tags = [f"{registry}:{build_configuration.version}" for registry in build_configuration.registry]
56+
all_tags = [f"{registry}:{build_configuration.version}" for registry in build_configuration.registries]
5757

5858
logger.info(
5959
f"Building image with tags {all_tags} for platforms={build_configuration.platforms}, dockerfile args: {build_args}"
@@ -72,7 +72,7 @@ def build_image(
7272
logger.info("Logging in MongoDB Artifactory for Garasign image")
7373
mongodb_artifactory_login()
7474
logger.info("Signing image")
75-
for registry in build_configuration.registry:
75+
for registry in build_configuration.registries:
7676
sign_image(registry, build_configuration.version)
7777
verify_signature(registry, build_configuration.version)
7878

scripts/release/build/build_info.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
@dataclass
2929
class ImageInfo:
30-
repository: List[str]
30+
repositories: List[str]
3131
platforms: list[str]
3232
version: str
3333
dockerfile_path: str
@@ -103,7 +103,7 @@ def load_build_info(
103103
image_version = version
104104

105105
images[name] = ImageInfo(
106-
repository=scenario_data["repository"],
106+
repositories=scenario_data["repository"],
107107
platforms=scenario_data["platforms"],
108108
version=image_version,
109109
dockerfile_path=data["dockerfile-path"],

scripts/release/build/image_build_configuration.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class ImageBuildConfiguration:
1111
scenario: BuildScenario
1212
version: str
13-
registry: List[str]
13+
registries: List[str]
1414
dockerfile_path: str
1515

1616
parallel: bool = False
@@ -23,8 +23,8 @@ def is_release_scenario(self) -> bool:
2323
return self.scenario == BuildScenario.RELEASE
2424

2525
def image_name(self) -> str:
26-
return self.registry[0].rpartition("/")[2]
26+
return self.registries[0].rpartition("/")[2]
2727

2828
def get_registries(self) -> List[str]:
2929
"""Return list of registries."""
30-
return self.registry
30+
return self.registries

scripts/release/pipeline_main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def image_build_config_from_args(args) -> ImageBuildConfiguration:
109109

110110
# Resolve final values with overrides
111111
version = args.version or image_build_info.version
112-
registry = args.registry or image_build_info.repository
112+
registries = [args.registries] or image_build_info.repositories
113113
platforms = get_platforms_from_arg(args.platform) or image_build_info.platforms
114114
sign = args.sign or image_build_info.sign
115115
dockerfile_path = image_build_info.dockerfile_path
@@ -122,7 +122,7 @@ def image_build_config_from_args(args) -> ImageBuildConfiguration:
122122
return ImageBuildConfiguration(
123123
scenario=build_scenario,
124124
version=version,
125-
registry=registry,
125+
registries=registries,
126126
dockerfile_path=dockerfile_path,
127127
parallel=args.parallel,
128128
platforms=platforms,

scripts/release/release_info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def convert_to_release_info_json(build_info: BuildInfo) -> dict:
5858

5959
for name, image in images.items():
6060
output["images"][name] = {
61-
"repository": image.repository,
61+
"repository": image.repositories,
6262
"platforms": image.platforms,
6363
"version": image.version,
6464
}

0 commit comments

Comments
 (0)