From 415fc7b41ef749c01779570d493329a6d9a93e9f Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Wed, 28 May 2025 05:37:58 +0000 Subject: [PATCH] builder: replace uses of errdefs package Signed-off-by: Matthieu MOREL --- builder/dockerfile/containerbackend.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/dockerfile/containerbackend.go b/builder/dockerfile/containerbackend.go index a0b0a8ed57..11e6404f74 100644 --- a/builder/dockerfile/containerbackend.go +++ b/builder/dockerfile/containerbackend.go @@ -5,11 +5,11 @@ import ( "fmt" "io" + cerrdefs "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" "github.com/docker/docker/builder" - "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/stringid" "github.com/pkg/errors" ) @@ -126,7 +126,7 @@ func (e *statusCodeError) StatusCode() int { // RemoveAll containers managed by this container manager func (c *containerManager) RemoveAll(stdout io.Writer) { for containerID := range c.tmpContainers { - if err := c.backend.ContainerRm(containerID, &backend.ContainerRmConfig{ForceRemove: true, RemoveVolume: true}); err != nil && !errdefs.IsNotFound(err) { + if err := c.backend.ContainerRm(containerID, &backend.ContainerRmConfig{ForceRemove: true, RemoveVolume: true}); err != nil && !cerrdefs.IsNotFound(err) { _, _ = fmt.Fprintf(stdout, "Removing intermediate container %s: %v\n", stringid.TruncateID(containerID), err) continue }