@@ -11,7 +11,6 @@ import (

 	"github.com/containerd/log"

 	containertypes "github.com/docker/docker/api/types/container"

 	networktypes "github.com/docker/docker/api/types/network"

-	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/daemon/config"

 	"github.com/docker/docker/daemon/network"

@@ -149,7 +148,7 @@ func (daemon *Daemon) newContainer(name string, platform ocispec.Platform, confi

 			config.Hostname = id[:12]

 		}

 	}

-	entrypoint, args := daemon.getEntrypointAndArgs(config.Entrypoint, config.Cmd)

+	entrypoint, args := getEntrypointAndArgs(config.Entrypoint, config.Cmd)

 	base := container.NewBaseContainer(id, filepath.Join(daemon.repository, id))

 	base.Created = time.Now().UTC()

@@ -167,6 +166,13 @@ func (daemon *Daemon) newContainer(name string, platform ocispec.Platform, confi

 	return base, err

 }

+func getEntrypointAndArgs(configEntrypoint, configCmd []string) (string, []string) {

+	if len(configEntrypoint) == 0 {

+		return configCmd[0], configCmd[1:]

+	}

+	return configEntrypoint[0], append(configEntrypoint[1:], configCmd...)

+}

+

 // GetByName returns a container given a name.

 func (daemon *Daemon) GetByName(name string) (*container.Container, error) {

 	if len(name) == 0 {

@@ -187,13 +193,6 @@ func (daemon *Daemon) GetByName(name string) (*container.Container, error) {

 	return e, nil

 }

-func (daemon *Daemon) getEntrypointAndArgs(configEntrypoint strslice.StrSlice, configCmd strslice.StrSlice) (string, []string) {

-	if len(configEntrypoint) != 0 {

-		return configEntrypoint[0], append(configEntrypoint[1:], configCmd...)

-	}

-	return configCmd[0], configCmd[1:]

-}

-

 func (daemon *Daemon) setSecurityOptions(cfg *config.Config, container *container.Container, hostConfig *containertypes.HostConfig) error {

 	container.Lock()

 	defer container.Unlock()

@@ -14,7 +14,6 @@ import (

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

 	containertypes "github.com/docker/docker/api/types/container"

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

-	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/container/stream"

 	"github.com/docker/docker/errdefs"

@@ -100,9 +99,6 @@ func (daemon *Daemon) ContainerExecCreate(name string, options *containertypes.E

 		return "", err

 	}

-	cmd := strslice.StrSlice(options.Cmd)

-	entrypoint, args := daemon.getEntrypointAndArgs(strslice.StrSlice{}, cmd)

-

 	keys := []byte{}

 	if options.DetachKeys != "" {

 		keys, err = term.ToBytes(options.DetachKeys)

@@ -117,8 +113,7 @@ func (daemon *Daemon) ContainerExecCreate(name string, options *containertypes.E

 	execConfig.OpenStdout = options.AttachStdout

 	execConfig.OpenStderr = options.AttachStderr

 	execConfig.DetachKeys = keys

-	execConfig.Entrypoint = entrypoint

-	execConfig.Args = args

+	execConfig.Entrypoint, execConfig.Args = options.Cmd[0], options.Cmd[1:]

 	execConfig.Tty = options.Tty

 	execConfig.ConsoleSize = options.ConsoleSize

 	execConfig.Privileged = options.Privileged

@@ -13,7 +13,6 @@ import (

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

 	containertypes "github.com/docker/docker/api/types/container"

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

-	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/container"

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

 )

@@ -69,18 +68,16 @@ type cmdProbe struct {

 // Returns the exit code and probe output (if any)

 func (p *cmdProbe) run(ctx context.Context, d *Daemon, cntr *container.Container) (*containertypes.HealthcheckResult, error) {

 	startTime := time.Now()

-	cmdSlice := strslice.StrSlice(cntr.Config.Healthcheck.Test)[1:]

+	cmd := cntr.Config.Healthcheck.Test[1:]

 	if p.shell {

-		cmdSlice = append(getShell(cntr), cmdSlice...)

+		cmd = append(getShell(cntr), cmd...)

 	}

-	entrypoint, args := d.getEntrypointAndArgs(strslice.StrSlice{}, cmdSlice)

 	execConfig := container.NewExecConfig(cntr)

 	execConfig.OpenStdin = false

 	execConfig.OpenStdout = true

 	execConfig.OpenStderr = true

 	execConfig.DetachKeys = []byte{}

-	execConfig.Entrypoint = entrypoint

-	execConfig.Args = args

+	execConfig.Entrypoint, execConfig.Args = cmd[0], cmd[1:]

 	execConfig.Tty = false

 	execConfig.Privileged = false

 	execConfig.User = cntr.Config.User