new file mode 100644

@@ -0,0 +1,14 @@

+package libcontainerd

+

+import (

+	"context"

+

+	containerd "github.com/containerd/containerd/v2/client"

+	"github.com/docker/docker/daemon/internal/libcontainerd/remote"

+	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"

+)

+

+// NewClient creates a new libcontainerd client from a containerd client

+func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) {

+	return remote.NewClient(ctx, cli, stateDir, ns, b)

+}

new file mode 100644

@@ -0,0 +1,19 @@

+package libcontainerd

+

+import (

+	"context"

+

+	containerd "github.com/containerd/containerd/v2/client"

+	"github.com/docker/docker/daemon/internal/libcontainerd/local"

+	"github.com/docker/docker/daemon/internal/libcontainerd/remote"

+	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"

+	"github.com/docker/docker/pkg/system"

+)

+

+// NewClient creates a new libcontainerd client from a containerd client

+func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) {

+	if !system.ContainerdRuntimeSupported() {

+		return local.NewClient(ctx, b)

+	}

+	return remote.NewClient(ctx, cli, stateDir, ns, b)

+}

new file mode 100644

@@ -0,0 +1,61 @@

+package libcontainerd

+

+import (

+	"context"

+

+	containerd "github.com/containerd/containerd/v2/client"

+	cerrdefs "github.com/containerd/errdefs"

+	"github.com/containerd/log"

+	"github.com/opencontainers/runtime-spec/specs-go"

+	"github.com/pkg/errors"

+

+	"github.com/docker/docker/daemon/internal/libcontainerd/types"

+)

+

+// ReplaceContainer creates a new container, replacing any existing container

+// with the same id if necessary.

+func ReplaceContainer(ctx context.Context, client types.Client, id string, spec *specs.Spec, shim string, runtimeOptions interface{}, opts ...containerd.NewContainerOpts) (types.Container, error) {

+	newContainer := func() (types.Container, error) {

+		return client.NewContainer(ctx, id, spec, shim, runtimeOptions, opts...)

+	}

+	ctr, err := newContainer()

+	if err == nil || !cerrdefs.IsConflict(err) {

+		return ctr, err

+	}

+

+	log.G(ctx).WithContext(ctx).WithField("container", id).Debug("A container already exists with the same ID. Attempting to clean up the old container.")

+	ctr, err = client.LoadContainer(ctx, id)

+	if err != nil {

+		if cerrdefs.IsNotFound(err) {

+			// Task failed successfully: the container no longer exists,

+			// despite us not doing anything. May as well try to create

+			// the container again. It might succeed.

+			return newContainer()

+		}

+		return nil, errors.Wrap(err, "could not load stale containerd container object")

+	}

+	tsk, err := ctr.Task(ctx)

+	if err != nil {

+		if cerrdefs.IsNotFound(err) {

+			goto deleteContainer

+		}

+		// There is no point in trying to delete the container if we

+		// cannot determine whether or not it has a task. The containerd

+		// client would just try to load the task itself, get the same

+		// error, and give up.

+		return nil, errors.Wrap(err, "could not load stale containerd task object")

+	}

+	if err := tsk.ForceDelete(ctx); err != nil {

+		if !cerrdefs.IsNotFound(err) {

+			return nil, errors.Wrap(err, "could not delete stale containerd task object")

+		}

+		// The task might have exited on its own. Proceed with

+		// attempting to delete the container.

+	}

+deleteContainer:

+	if err := ctr.Delete(ctx); err != nil && !cerrdefs.IsNotFound(err) {

+		return nil, errors.Wrap(err, "could not delete stale containerd container object")

+	}

+

+	return newContainer()

+}

@@ -11,9 +11,9 @@ import (

 	"github.com/containerd/containerd/v2/pkg/cio"

 	cerrdefs "github.com/containerd/errdefs"

 	"github.com/containerd/log"

+	"github.com/docker/docker/daemon/internal/libcontainerd"

 	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"

 	"github.com/docker/docker/errdefs"

-	"github.com/docker/docker/libcontainerd"

 	"github.com/opencontainers/runtime-spec/specs-go"

 	"github.com/pkg/errors"

 )

@@ -11,10 +11,10 @@ import (

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/daemon/container"

 	mobyc8dstore "github.com/docker/docker/daemon/containerd"

+	"github.com/docker/docker/daemon/internal/libcontainerd"

 	"github.com/docker/docker/daemon/internal/metrics"

 	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/internal/otelutil"

-	"github.com/docker/docker/libcontainerd"

 	"github.com/pkg/errors"

 	"go.opentelemetry.io/otel"

 	"go.opentelemetry.io/otel/attribute"

deleted file mode 100644

@@ -1,14 +0,0 @@

-package libcontainerd

-

-import (

-	"context"

-

-	containerd "github.com/containerd/containerd/v2/client"

-	"github.com/docker/docker/daemon/internal/libcontainerd/remote"

-	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"

-)

-

-// NewClient creates a new libcontainerd client from a containerd client

-func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) {

-	return remote.NewClient(ctx, cli, stateDir, ns, b)

-}

deleted file mode 100644

@@ -1,19 +0,0 @@

-package libcontainerd

-

-import (

-	"context"

-

-	containerd "github.com/containerd/containerd/v2/client"

-	"github.com/docker/docker/daemon/internal/libcontainerd/local"

-	"github.com/docker/docker/daemon/internal/libcontainerd/remote"

-	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"

-	"github.com/docker/docker/pkg/system"

-)

-

-// NewClient creates a new libcontainerd client from a containerd client

-func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) {

-	if !system.ContainerdRuntimeSupported() {

-		return local.NewClient(ctx, b)

-	}

-	return remote.NewClient(ctx, cli, stateDir, ns, b)

-}

deleted file mode 100644

@@ -1,61 +0,0 @@

-package libcontainerd

-

-import (

-	"context"

-

-	containerd "github.com/containerd/containerd/v2/client"

-	cerrdefs "github.com/containerd/errdefs"

-	"github.com/containerd/log"

-	"github.com/opencontainers/runtime-spec/specs-go"

-	"github.com/pkg/errors"

-

-	"github.com/docker/docker/daemon/internal/libcontainerd/types"

-)

-

-// ReplaceContainer creates a new container, replacing any existing container

-// with the same id if necessary.

-func ReplaceContainer(ctx context.Context, client types.Client, id string, spec *specs.Spec, shim string, runtimeOptions interface{}, opts ...containerd.NewContainerOpts) (types.Container, error) {

-	newContainer := func() (types.Container, error) {

-		return client.NewContainer(ctx, id, spec, shim, runtimeOptions, opts...)

-	}

-	ctr, err := newContainer()

-	if err == nil || !cerrdefs.IsConflict(err) {

-		return ctr, err

-	}

-

-	log.G(ctx).WithContext(ctx).WithField("container", id).Debug("A container already exists with the same ID. Attempting to clean up the old container.")

-	ctr, err = client.LoadContainer(ctx, id)

-	if err != nil {

-		if cerrdefs.IsNotFound(err) {

-			// Task failed successfully: the container no longer exists,

-			// despite us not doing anything. May as well try to create

-			// the container again. It might succeed.

-			return newContainer()

-		}

-		return nil, errors.Wrap(err, "could not load stale containerd container object")

-	}

-	tsk, err := ctr.Task(ctx)

-	if err != nil {

-		if cerrdefs.IsNotFound(err) {

-			goto deleteContainer

-		}

-		// There is no point in trying to delete the container if we

-		// cannot determine whether or not it has a task. The containerd

-		// client would just try to load the task itself, get the same

-		// error, and give up.

-		return nil, errors.Wrap(err, "could not load stale containerd task object")

-	}

-	if err := tsk.ForceDelete(ctx); err != nil {

-		if !cerrdefs.IsNotFound(err) {

-			return nil, errors.Wrap(err, "could not delete stale containerd task object")

-		}

-		// The task might have exited on its own. Proceed with

-		// attempting to delete the container.

-	}

-deleteContainer:

-	if err := ctr.Delete(ctx); err != nil && !cerrdefs.IsNotFound(err) {

-		return nil, errors.Wrap(err, "could not delete stale containerd container object")

-	}

-

-	return newContainer()

-}