Explorar o código

c8d: ImageService.softImageDelete: use OCI and containerd constants

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit df5deab20b9d7477635496edff92aa57473e4153)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Sebastiaan van Stijn %!s(int64=2) %!d(string=hai) anos
pai
achega
42f3f7ed86
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      daemon/containerd/soft_delete.go

+ 3 - 2
daemon/containerd/soft_delete.go

@@ -7,6 +7,7 @@ import (
 	containerdimages "github.com/containerd/containerd/images"
 	containerdimages "github.com/containerd/containerd/images"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/errdefs"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/go-digest"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/pkg/errors"
 )
 )
 
 
@@ -32,8 +33,8 @@ func (i *ImageService) softImageDelete(ctx context.Context, img containerdimages
 		danglingImage := img
 		danglingImage := img
 
 
 		danglingImage.Name = danglingImageName(img.Target.Digest)
 		danglingImage.Name = danglingImageName(img.Target.Digest)
-		delete(danglingImage.Labels, "io.containerd.image.name")
-		delete(danglingImage.Labels, "org.opencontainers.image.ref.name")
+		delete(danglingImage.Labels, containerdimages.AnnotationImageName)
+		delete(danglingImage.Labels, ocispec.AnnotationRefName)
 
 
 		_, err = is.Create(context.Background(), danglingImage)
 		_, err = is.Create(context.Background(), danglingImage)