File tree Expand file tree Collapse file tree 6 files changed +57
-55
lines changed Expand file tree Collapse file tree 6 files changed +57
-55
lines changed Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ def build_image(
53
53
span .set_attribute ("mck.platforms" , build_configuration .platforms )
54
54
55
55
# 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 ]
57
57
58
58
logger .info (
59
59
f"Building image with tags { all_tags } for platforms={ build_configuration .platforms } , dockerfile args: { build_args } "
@@ -72,7 +72,7 @@ def build_image(
72
72
logger .info ("Logging in MongoDB Artifactory for Garasign image" )
73
73
mongodb_artifactory_login ()
74
74
logger .info ("Signing image" )
75
- for registry in build_configuration .registry :
75
+ for registry in build_configuration .registries :
76
76
sign_image (registry , build_configuration .version )
77
77
verify_signature (registry , build_configuration .version )
78
78
Original file line number Diff line number Diff line change 27
27
28
28
@dataclass
29
29
class ImageInfo :
30
- repository : List [str ]
30
+ repositories : List [str ]
31
31
platforms : list [str ]
32
32
version : str
33
33
dockerfile_path : str
@@ -103,7 +103,7 @@ def load_build_info(
103
103
image_version = version
104
104
105
105
images [name ] = ImageInfo (
106
- repository = scenario_data ["repository" ],
106
+ repositories = scenario_data ["repository" ],
107
107
platforms = scenario_data ["platforms" ],
108
108
version = image_version ,
109
109
dockerfile_path = data ["dockerfile-path" ],
Original file line number Diff line number Diff line change 10
10
class ImageBuildConfiguration :
11
11
scenario : BuildScenario
12
12
version : str
13
- registry : List [str ]
13
+ registries : List [str ]
14
14
dockerfile_path : str
15
15
16
16
parallel : bool = False
@@ -23,8 +23,8 @@ def is_release_scenario(self) -> bool:
23
23
return self .scenario == BuildScenario .RELEASE
24
24
25
25
def image_name (self ) -> str :
26
- return self .registry [0 ].rpartition ("/" )[2 ]
26
+ return self .registries [0 ].rpartition ("/" )[2 ]
27
27
28
28
def get_registries (self ) -> List [str ]:
29
29
"""Return list of registries."""
30
- return self .registry
30
+ return self .registries
Original file line number Diff line number Diff line change @@ -109,7 +109,7 @@ def image_build_config_from_args(args) -> ImageBuildConfiguration:
109
109
110
110
# Resolve final values with overrides
111
111
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
113
113
platforms = get_platforms_from_arg (args .platform ) or image_build_info .platforms
114
114
sign = args .sign or image_build_info .sign
115
115
dockerfile_path = image_build_info .dockerfile_path
@@ -122,7 +122,7 @@ def image_build_config_from_args(args) -> ImageBuildConfiguration:
122
122
return ImageBuildConfiguration (
123
123
scenario = build_scenario ,
124
124
version = version ,
125
- registry = registry ,
125
+ registries = registries ,
126
126
dockerfile_path = dockerfile_path ,
127
127
parallel = args .parallel ,
128
128
platforms = platforms ,
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ def convert_to_release_info_json(build_info: BuildInfo) -> dict:
58
58
59
59
for name , image in images .items ():
60
60
output ["images" ][name ] = {
61
- "repository" : image .repository ,
61
+ "repository" : image .repositories ,
62
62
"platforms" : image .platforms ,
63
63
"version" : image .version ,
64
64
}
You can’t perform that action at this time.
0 commit comments