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

 	"github.com/containerd/containerd/cio"

 	"github.com/containerd/log"

+	"github.com/containerd/platforms"

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

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

 	mounttypes "github.com/docker/docker/api/types/mount"

@@ -84,7 +85,12 @@ type Container struct {

 	LogPath         string

 	Name            string

 	Driver          string

-	OS              string

+

+	// Deprecated: use [ImagePlatform.OS] instead.

+	// TODO: Remove, see https://github.com/moby/moby/issues/48892

+	OS string

+

+	ImagePlatform ocispec.Platform

 	RestartCount             int

 	HasBeenStartedBefore     bool

@@ -162,11 +168,17 @@ func (container *Container) FromDisk() error {

 		return err

 	}

-	// Ensure the operating system is set if blank. Assume it is the OS of the

-	// host OS if not, to ensure containers created before multiple-OS

-	// support are migrated

-	if container.OS == "" {

-		container.OS = runtime.GOOS

+	if container.OS != "" {

+		// OS was deprecated in favor of ImagePlatform

+		// Make sure we migrate the OS to ImagePlatform.OS.

+		if container.ImagePlatform.OS == "" {

+			container.ImagePlatform.OS = container.OS //nolint:staticcheck // ignore SA1019: field is deprecated

+		}

+	} else {

+		// Pre multiple-OS support containers have no OS set.

+		// Assume it is the host platform.

+		container.ImagePlatform = platforms.DefaultSpec()

+		container.OS = container.ImagePlatform.OS //nolint:staticcheck // ignore SA1019: field is deprecated

 	}

 	return container.readHostConfig()

@@ -752,7 +764,7 @@ func getConfigTargetPath(r *swarmtypes.ConfigReference) string {

 // CreateDaemonEnvironment creates a new environment variable slice for this container.

 func (container *Container) CreateDaemonEnvironment(tty bool, linkedEnv []string) []string {

 	// Setup environment

-	ctrOS := container.OS

+	ctrOS := container.ImagePlatform.OS

 	if ctrOS == "" {

 		ctrOS = runtime.GOOS

 	}

@@ -151,7 +151,7 @@ func (daemon *Daemon) CreateImageFromContainer(ctx context.Context, name string,

 	if c.Config == nil {

 		c.Config = container.Config

 	}

-	newConfig, err := dockerfile.BuildFromConfig(ctx, c.Config, c.Changes, container.OS)

+	newConfig, err := dockerfile.BuildFromConfig(ctx, c.Config, c.Changes, container.ImagePlatform.OS)

 	if err != nil {

 		return "", err

 	}

@@ -166,7 +166,7 @@ func (daemon *Daemon) CreateImageFromContainer(ctx context.Context, name string,

 		ContainerConfig:     container.Config,

 		ContainerID:         container.ID,

 		ContainerMountLabel: container.MountLabel,

-		ContainerOS:         container.OS,

+		ContainerOS:         container.ImagePlatform.OS,

 		ParentImageID:       string(container.ImageID),

 	})

 	if err != nil {

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

 	volumemounts "github.com/docker/docker/volume/mounts"

 	"github.com/docker/go-connections/nat"

 	"github.com/moby/sys/signal"

+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/opencontainers/selinux/go-selinux"

 	"github.com/pkg/errors"

 )

@@ -119,7 +120,7 @@ func (daemon *Daemon) register(ctx context.Context, c *container.Container) erro

 	return c.CheckpointTo(ctx, daemon.containersReplica)

 }

-func (daemon *Daemon) newContainer(name string, operatingSystem string, config *containertypes.Config, hostConfig *containertypes.HostConfig, imgID image.ID, managed bool) (*container.Container, error) {

+func (daemon *Daemon) newContainer(name string, platform ocispec.Platform, config *containertypes.Config, hostConfig *containertypes.HostConfig, imgID image.ID, managed bool) (*container.Container, error) {

 	var (

 		id  string

 		err error

@@ -153,8 +154,9 @@ func (daemon *Daemon) newContainer(name string, operatingSystem string, config *

 	base.NetworkSettings = &network.Settings{}

 	base.Name = name

 	base.Driver = daemon.imageService.StorageDriver()

-	base.OS = operatingSystem

-	return base, nil

+	base.ImagePlatform = platform

+	base.OS = platform.OS //nolint:staticcheck // ignore SA1019: field is deprecated, but still set for compatibility

+	return base, err

 }

 // GetByName returns a container given a name.

@@ -325,7 +325,7 @@ func (i *ImageService) CommitBuildStep(ctx context.Context, c backend.CommitConf

 		return "", fmt.Errorf("container not found: %s", c.ContainerID)

 	}

 	c.ContainerMountLabel = ctr.MountLabel

-	c.ContainerOS = ctr.OS

+	c.ContainerOS = ctr.ImagePlatform.OS

 	c.ParentImageID = string(ctr.ImageID)

 	return i.CommitImage(ctx, c)

 }

@@ -3,7 +3,6 @@ package daemon // import "github.com/docker/docker/daemon"

 import (

 	"context"

 	"fmt"

-	"runtime"

 	"strings"

 	"time"

@@ -23,7 +22,7 @@ import (

 	"github.com/docker/docker/runconfig"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/opencontainers/selinux/go-selinux"

-	archvariant "github.com/tonistiigi/go-archvariant"

+	"github.com/tonistiigi/go-archvariant"

 )

 type createOpts struct {

@@ -130,7 +129,7 @@ func (daemon *Daemon) create(ctx context.Context, daemonCfg *config.Config, opts

 		imgManifest *ocispec.Descriptor

 		imgID       image.ID

 		err         error

-		os          = runtime.GOOS

+		platform    = platforms.DefaultSpec()

 	)

 	if opts.params.Config.Image != "" {

@@ -148,17 +147,17 @@ func (daemon *Daemon) create(ctx context.Context, daemonCfg *config.Config, opts

 				return nil, err

 			}

 		}

-		os = img.OperatingSystem()

+		platform = img.Platform()

 		imgID = img.ID()

 	} else if isWindows {

-		os = "linux" // 'scratch' case.

+		platform.OS = "linux" // 'scratch' case.

 	}

 	// On WCOW, if are not being invoked by the builder to create this container (where

 	// ignoreImagesArgEscaped will be true) - if the image already has its arguments escaped,

 	// ensure that this is replicated across to the created container to avoid double-escaping

 	// of the arguments/command line when the runtime attempts to run the container.

-	if os == "windows" && !opts.ignoreImagesArgsEscaped && img != nil && img.RunConfig().ArgsEscaped {

+	if platform.OS == "windows" && !opts.ignoreImagesArgsEscaped && img != nil && img.RunConfig().ArgsEscaped {

 		opts.params.Config.ArgsEscaped = true

 	}

@@ -170,7 +169,7 @@ func (daemon *Daemon) create(ctx context.Context, daemonCfg *config.Config, opts

 		return nil, errdefs.InvalidParameter(err)

 	}

-	if ctr, err = daemon.newContainer(opts.params.Name, os, opts.params.Config, opts.params.HostConfig, imgID, opts.managed); err != nil {

+	if ctr, err = daemon.newContainer(opts.params.Name, platform, opts.params.Config, opts.params.HostConfig, imgID, opts.managed); err != nil {

 		return nil, err

 	}

 	defer func() {

@@ -9,7 +9,7 @@ import (

 )

 func (daemon *Daemon) execSetPlatformOpt(ctx context.Context, daemonCfg *config.Config, ec *container.ExecConfig, p *specs.Process) error {

-	if ec.Container.OS == "windows" {

+	if ec.Container.ImagePlatform.OS == "windows" {

 		p.User.Username = ec.User

 	}

 	return nil

@@ -20,7 +20,7 @@ func (daemon *Daemon) ContainerExport(ctx context.Context, name string, out io.W

 		return err

 	}

-	if isWindows && ctr.OS == "windows" {

+	if isWindows && ctr.ImagePlatform.OS == "windows" {

 		return fmt.Errorf("the daemon on this operating system does not support exporting Windows containers")

 	}

@@ -457,7 +457,7 @@ func getShell(cntr *container.Container) []string {

 	if runtime.GOOS != "windows" {

 		return []string{"/bin/sh", "-c"}

 	}

-	if cntr.OS != runtime.GOOS {

+	if cntr.ImagePlatform.OS != runtime.GOOS {

 		return []string{"/bin/sh", "-c"}

 	}

 	return []string{"cmd", "/S", "/C"}

@@ -128,7 +128,7 @@ func (i *ImageService) CommitBuildStep(ctx context.Context, c backend.CommitConf

 		return "", errors.Errorf("container not found: %s", c.ContainerID)

 	}

 	c.ContainerMountLabel = ctr.MountLabel

-	c.ContainerOS = ctr.OS

+	c.ContainerOS = ctr.ImagePlatform.OS

 	c.ParentImageID = string(ctr.ImageID)

 	return i.CommitImage(ctx, c)

 }

@@ -145,7 +145,7 @@ func (daemon *Daemon) getInspectData(daemonCfg *config.Config, container *contai

 		Name:         container.Name,

 		RestartCount: container.RestartCount,

 		Driver:       container.Driver,

-		Platform:     container.OS,

+		Platform:     container.ImagePlatform.OS,

 		MountLabel:   container.MountLabel,

 		ProcessLabel: container.ProcessLabel,

 		ExecIDs:      container.GetExecIDs(),