0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve merge conflicts

Browse source 
Signed-off-by: Charity Kathure <ckathure@microsoft.com>
This commit is contained in:
Charity Kathure 2024-02-13 15:46:01 +03:00
parent 4be37b158b
commit 6fde5ab3f2
No known key found for this signature in database
GPG key ID: 351C0932135D89C3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/dockerd/daemon_windows.go
View file

@ -9,6 +9,7 @@ import (
"github.com/containerd/log"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/libcontainerd/supervisor"
"github.com/docker/docker/pkg/system"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

4
daemon/daemon_windows.go
View file

@ -563,7 +563,7 @@ func (daemon *Daemon) initLibcontainerd(ctx context.Context, cfg *config.Config)
rt := cfg.DefaultRuntime
if rt == "" {
if daemon.configStore.ContainerdAddr == "" {
if cfg.ContainerdAddr == "" {
rt = config.WindowsV1RuntimeName
} else {
rt = config.WindowsV2RuntimeName
@ -580,7 +580,7 @@ func (daemon *Daemon) initLibcontainerd(ctx context.Context, cfg *config.Config)
daemon,
)
case config.WindowsV2RuntimeName:
if daemon.configStore.ContainerdAddr == "" {
if cfg.ContainerdAddr == "" {
return fmt.Errorf("cannot use the specified runtime %q without containerd", rt)
}
daemon.containerd, err = remote.NewClient(