Skip to content

Commit 7ca23aa

Browse files
committed
feat(build): new option --container-registry-mirror /2
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent a6b8164 commit 7ca23aa

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

cmd/werf/bundle/download/download.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
7070
common.SetupInsecureRegistry(&commonCmdData, cmd)
7171
common.SetupInsecureHelmDependencies(&commonCmdData, cmd, false)
7272
common.SetupSkipTlsVerifyRegistry(&commonCmdData, cmd)
73+
common.SetupContainerRegistryMirror(&commonCmdData, cmd)
7374

7475
common.SetupRepoOptions(&commonCmdData, cmd, common.RepoDataOptions{})
7576

@@ -92,7 +93,12 @@ func runDownload(ctx context.Context) error {
9293
return fmt.Errorf("initialization error: %w", err)
9394
}
9495

95-
if err := common.DockerRegistryInit(ctx, &commonCmdData); err != nil {
96+
registryMirrors, err := common.GetContainerRegistryMirror(ctx, &commonCmdData)
97+
if err != nil {
98+
return fmt.Errorf("get container registry mirrors: %w", err)
99+
}
100+
101+
if err := common.DockerRegistryInit(ctx, &commonCmdData, registryMirrors); err != nil {
96102
return err
97103
}
98104

cmd/werf/bundle/export/export.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
110110
common.SetupInsecureRegistry(&commonCmdData, cmd)
111111
common.SetupInsecureHelmDependencies(&commonCmdData, cmd, true)
112112
common.SetupSkipTlsVerifyRegistry(&commonCmdData, cmd)
113+
common.SetupContainerRegistryMirror(&commonCmdData, cmd)
113114

114115
common.SetupLogOptions(&commonCmdData, cmd)
115116
common.SetupLogProjectDir(&commonCmdData, cmd)
@@ -160,7 +161,12 @@ func runExport(ctx context.Context, imagesToProcess build.ImagesToProcess) error
160161
return fmt.Errorf("initialization error: %w", err)
161162
}
162163

163-
containerBackend, processCtx, err := common.InitProcessContainerBackend(ctx, &commonCmdData)
164+
registryMirrors, err := common.GetContainerRegistryMirror(ctx, &commonCmdData)
165+
if err != nil {
166+
return fmt.Errorf("get container registry mirrors: %w", err)
167+
}
168+
169+
containerBackend, processCtx, err := common.InitProcessContainerBackend(ctx, &commonCmdData, registryMirrors)
164170
if err != nil {
165171
return err
166172
}
@@ -187,7 +193,7 @@ func runExport(ctx context.Context, imagesToProcess build.ImagesToProcess) error
187193
return err
188194
}
189195

190-
if err := common.DockerRegistryInit(ctx, &commonCmdData); err != nil {
196+
if err := common.DockerRegistryInit(ctx, &commonCmdData, registryMirrors); err != nil {
191197
return err
192198
}
193199

0 commit comments

Comments
 (0)