From 8c4af5dacb2232f86c33defc0d45fcdc8af80ea0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 1 Aug 2023 21:03:07 +0200 Subject: [PATCH] distribution: show image schema deprecation on all registries When we added this deprecation warning, some registries had not yet moved away from the deprecated specification, so we made the warning conditional for pulling from Docker Hub. That condition was added in 647dfe99a50badd27f0508c67eddc4b4923fcef7, which is over 4 Years ago, which should be time enough for images and registries to have moved to current specifications. Signed-off-by: Sebastiaan van Stijn --- distribution/pull_v2.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go index a343e97f1ea3f..da70daa96f4e6 100644 --- a/distribution/pull_v2.go +++ b/distribution/pull_v2.go @@ -436,13 +436,9 @@ func (p *puller) pullTag(ctx context.Context, ref reference.Named, platform *oci switch v := manifest.(type) { case *schema1.SignedManifest: - // give registries time to upgrade to schema2 and only warn if we know a registry has been upgraded long time ago - // TODO: condition to be removed - if reference.Domain(ref) == "docker.io" { - msg := fmt.Sprintf("[DEPRECATION NOTICE] Docker Image Format v1, and Docker Image manifest version 2, schema 1 support will be removed in an upcoming release. Suggest the author of %s to upgrade the image to the OCI Format, or Docker Image manifest v2, schema 2. More information at https://docs.docker.com/go/deprecated-image-specs/", ref) - log.G(ctx).Warn(msg) - progress.Message(p.config.ProgressOutput, "", msg) - } + msg := fmt.Sprintf("[DEPRECATION NOTICE] Docker Image Format v1, and Docker Image manifest version 2, schema 1 support will be removed in an upcoming release. Suggest the author of %s to upgrade the image to the OCI Format, or Docker Image manifest v2, schema 2. More information at https://docs.docker.com/go/deprecated-image-specs/", ref) + log.G(ctx).Warn(msg) + progress.Message(p.config.ProgressOutput, "", msg) id, manifestDigest, err = p.pullSchema1(ctx, ref, v, platform) if err != nil {