Merge pull request #40604 from thaJeztah/19.03_backport_mis_unlock
[19.03 backport] daemon/cluster: add a missing Unlock
diff --git a/api/types/client.go b/api/types/client.go
index 4b9f502..fe90617 100644
--- a/api/types/client.go
+++ b/api/types/client.go
@@ -50,7 +50,7 @@
// ContainerExecInspect holds information returned by exec inspect.
type ContainerExecInspect struct {
- ExecID string
+ ExecID string `json:"ID"`
ContainerID string
Running bool
ExitCode int
diff --git a/integration/container/exec_test.go b/integration/container/exec_test.go
index 392b5bb..8798ea9 100644
--- a/integration/container/exec_test.go
+++ b/integration/container/exec_test.go
@@ -102,6 +102,10 @@
)
assert.NilError(t, err)
+ inspect, err := client.ContainerExecInspect(ctx, id.ID)
+ assert.NilError(t, err)
+ assert.Check(t, is.Equal(inspect.ExecID, id.ID))
+
resp, err := client.ContainerExecAttach(ctx, id.ID,
types.ExecStartCheck{
Detach: false,
diff --git a/registry/registry.go b/registry/registry.go
index 6727b7d..3d1e1aa 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -17,6 +17,9 @@
"github.com/docker/go-connections/sockets"
"github.com/docker/go-connections/tlsconfig"
"github.com/sirupsen/logrus"
+
+ "github.com/docker/docker/pkg/homedir"
+ "github.com/docker/docker/rootless"
)
var (
@@ -32,7 +35,19 @@
tlsConfig.InsecureSkipVerify = !isSecure
if isSecure && CertsDir != "" {
- hostDir := filepath.Join(CertsDir, cleanPath(hostname))
+ certsDir := CertsDir
+
+ if rootless.RunningWithRootlessKit() {
+ configHome, err := homedir.GetConfigHome()
+ if err != nil {
+ return nil, err
+ }
+
+ certsDir = filepath.Join(configHome, "docker/certs.d")
+ }
+
+ hostDir := filepath.Join(certsDir, cleanPath(hostname))
+
logrus.Debugf("hostDir: %s", hostDir)
if err := ReadCertsDirectory(tlsConfig, hostDir); err != nil {
return nil, err
