Skip to content

Commit a1367a0

Browse files
authored
Merge pull request #4540 from thaJeztah/manifest_deref
cli/registry: fix client.pullManifestList not de-referencing manifest, and remove "v1" check
2 parents 28dfb13 + 22b4bab commit a1367a0

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

cli/registry/client/fetcher.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ func pullManifestList(ctx context.Context, ref reference.Named, repo distributio
186186
}
187187

188188
// Replace platform from config
189-
imageManifest.Descriptor.Platform = types.OCIPlatform(&manifestDescriptor.Platform)
189+
p := manifestDescriptor.Platform
190+
imageManifest.Descriptor.Platform = types.OCIPlatform(&p)
190191

191192
infos = append(infos, imageManifest)
192193
}
@@ -226,11 +227,6 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
226227

227228
confirmedTLSRegistries := make(map[string]bool)
228229
for _, endpoint := range endpoints {
229-
if endpoint.Version == registry.APIVersion1 {
230-
logrus.Debugf("skipping v1 endpoint %s", endpoint.URL)
231-
continue
232-
}
233-
234230
if endpoint.URL.Scheme != "https" {
235231
if _, confirmedTLS := confirmedTLSRegistries[endpoint.URL.Host]; confirmedTLS {
236232
logrus.Debugf("skipping non-TLS endpoint %s for host/port that appears to use TLS", endpoint.URL)

0 commit comments

Comments
 (0)