public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Support mirror registries with path component (#1707)

This commit is contained in:
Jason Hall 2021-08-11 01:06:51 -04:00 committed by GitHub
parent 211d487e44
commit 4e218f2162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/image/remote/remote.go
View File

@ -57,16 +57,16 @@ func RetrieveRemoteImage(image string, opts config.RegistryOptions, customPlatfo
} }
for _, registryMirror := range opts.RegistryMirrors { for _, registryMirror := range opts.RegistryMirrors {
var newReg name.Registry var newRepo name.Repository
if opts.InsecurePull || opts.InsecureRegistries.Contains(registryMirror) { if opts.InsecurePull || opts.InsecureRegistries.Contains(registryMirror) {
newReg, err = name.NewRegistry(registryMirror, name.WeakValidation, name.Insecure) newRepo, err = name.NewRepository(registryMirror, name.WeakValidation, name.Insecure)
} else { } else {
newReg, err = name.NewRegistry(registryMirror, name.StrictValidation) newRepo, err = name.NewRepository(registryMirror, name.StrictValidation)
} }
if err != nil { if err != nil {
return nil, err return nil, err
} }
ref := setNewRegistry(ref, newReg) ref := setNewRepository(ref, newRepo)
logrus.Infof("Retrieving image %s from registry mirror %s", ref, registryMirror) logrus.Infof("Retrieving image %s from registry mirror %s", ref, registryMirror)
remoteImage, err := remote.Image(ref, remoteOptions(registryMirror, opts, customPlatform)...) remoteImage, err := remote.Image(ref, remoteOptions(registryMirror, opts, customPlatform)...)
@ -113,6 +113,19 @@ func normalizeReference(ref name.Reference, image string) (name.Reference, error
return ref, nil return ref, nil
} }
func setNewRepository(ref name.Reference, newRepo name.Repository) name.Reference {
switch r := ref.(type) {
case name.Tag:
r.Repository = newRepo
return r
case name.Digest:
r.Repository = newRepo
return r
default:
return ref
}
}
func setNewRegistry(ref name.Reference, newReg name.Registry) name.Reference { func setNewRegistry(ref name.Reference, newReg name.Registry) name.Reference {
switch r := ref.(type) { switch r := ref.(type) {
case name.Tag: case name.Tag: