Skip to content

Commit e0d533b

Browse files
johnstepjohnstep
committed
Add Windows configs support
Signed-off-by: John Stephens <[email protected]>
1 parent 55fd0d0 commit e0d533b

5 files changed

Lines changed: 114 additions & 11 deletions

File tree

‎container/container_windows.go‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
const (
1515
containerSecretMountPath = `C:\ProgramData\Docker\secrets`
1616
containerInternalSecretMountPath = `C:\ProgramData\Docker\internal\secrets`
17+
containerInternalConfigsDirPath = `C:\ProgramData\Docker\internal\configs`
1718
)
1819

1920
// Container holds fields specific to the Windows implementation. See
@@ -91,6 +92,43 @@ func (container *Container) UnmountSecrets() error {
9192
return os.RemoveAll(container.SecretMountPath())
9293
}
9394

95+
// CreateConfigSymlinks creates symlinks to files in the config mount.
96+
func (container *Container) CreateConfigSymlinks() error {
97+
for _, configRef := range container.ConfigReferences {
98+
if configRef.File == nil {
99+
continue
100+
}
101+
resolvedPath, _, err := container.ResolvePath(configRef.File.Name)
102+
if err != nil {
103+
return err
104+
}
105+
if err := system.MkdirAll(filepath.Dir(resolvedPath), 0); err != nil {
106+
return err
107+
}
108+
if err := os.Symlink(filepath.Join(containerInternalConfigsDirPath, configRef.ConfigID), resolvedPath); err != nil {
109+
return err
110+
}
111+
}
112+
113+
return nil
114+
}
115+
116+
// ConfigMounts returns the mount for configs.
117+
// All configs are stored in a single mount on Windows. Target symlinks are
118+
// created for each config, pointing to the files in this mount.
119+
func (container *Container) ConfigMounts() []Mount {
120+
var mounts []Mount
121+
if len(container.ConfigReferences) > 0 {
122+
mounts = append(mounts, Mount{
123+
Source: container.ConfigsDirPath(),
124+
Destination: containerInternalConfigsDirPath,
125+
Writable: false,
126+
})
127+
}
128+
129+
return mounts
130+
}
131+
94132
// DetachAndUnmount unmounts all volumes.
95133
// On Windows it only delegates to `UnmountVolumes` since there is nothing to
96134
// force unmount.

‎daemon/configs_unsupported.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// +build !linux
1+
// +build !linux,!windows
22

33
package daemon
44

‎daemon/configs_windows.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// +build windows
2+
3+
package daemon
4+
5+
func configsSupported() bool {
6+
return true
7+
}

‎daemon/container_operations_windows.go‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,55 @@ func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]s
1616
return nil, nil
1717
}
1818

19+
func (daemon *Daemon) setupConfigDir(c *container.Container) (setupErr error) {
20+
if len(c.ConfigReferences) == 0 {
21+
return nil
22+
}
23+
24+
localPath := c.ConfigsDirPath()
25+
logrus.Debugf("configs: setting up config dir: %s", localPath)
26+
27+
// create local config root
28+
if err := system.MkdirAllWithACL(localPath, 0); err != nil {
29+
return errors.Wrap(err, "error creating config dir")
30+
}
31+
32+
defer func() {
33+
if setupErr != nil {
34+
if err := os.RemoveAll(localPath); err != nil {
35+
logrus.Errorf("error cleaning up config dir: %s", err)
36+
}
37+
}
38+
}()
39+
40+
if c.DependencyStore == nil {
41+
return fmt.Errorf("config store is not initialized")
42+
}
43+
44+
for _, configRef := range c.ConfigReferences {
45+
// TODO (ehazlett): use type switch when more are supported
46+
if configRef.File == nil {
47+
logrus.Error("config target type is not a file target")
48+
continue
49+
}
50+
51+
fPath := c.ConfigFilePath(*configRef)
52+
53+
log := logrus.WithFields(logrus.Fields{"name": configRef.File.Name, "path": fPath})
54+
55+
log.Debug("injecting config")
56+
config := c.DependencyStore.Configs().Get(configRef.ConfigID)
57+
if config == nil {
58+
return fmt.Errorf("unable to get config from config store")
59+
}
60+
if err := ioutil.WriteFile(fPath, config.Spec.Data, configRef.File.Mode); err != nil {
61+
return errors.Wrap(err, "error injecting config")
62+
}
63+
}
64+
65+
return nil
66+
}
67+
1968
// getSize returns real size & virtual size
2069
func (daemon *Daemon) getSize(containerID string) (int64, int64) {
2170
// TODO Windows

‎daemon/oci_windows.go‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
2929
return nil, err
3030
}
3131

32+
if err := daemon.setupConfigDir(c); err != nil {
33+
return nil, err
34+
}
35+
3236
// In s.Mounts
3337
mounts, err := daemon.setupMounts(c)
3438
if err != nil {
@@ -44,24 +48,25 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
4448
isHyperV = c.HostConfig.Isolation.IsHyperV()
4549
}
4650

47-
// If the container has not been started, and has secrets, create symlinks
48-
// to each secret. If it has been started before, the symlinks should have
49-
// already been created. Also, it is important to not mount a Hyper-V
50-
// container that has been started before, to protect the host from the
51-
// container; for example, from malicious mutation of NTFS data structures.
52-
if !c.HasBeenStartedBefore && len(c.SecretReferences) > 0 {
51+
// If the container has not been started, and has configs or secrets
52+
// secrets, create symlinks to each confing and secret. If it has been
53+
// started before, the symlinks should have already been created. Also, it
54+
// is important to not mount a Hyper-V container that has been started
55+
// before, to protect the host from the container; for example, from
56+
// malicious mutation of NTFS data structures.
57+
if !c.HasBeenStartedBefore && (len(c.SecretReferences) > 0 || len(c.ConfigReferences) > 0) {
5358
// The container file system is mounted before this function is called,
5459
// except for Hyper-V containers, so mount it here in that case.
5560
if isHyperV {
5661
if err := daemon.Mount(c); err != nil {
5762
return nil, err
5863
}
64+
defer daemon.Unmount(c)
5965
}
60-
err := c.CreateSecretSymlinks()
61-
if isHyperV {
62-
daemon.Unmount(c)
66+
if err := c.CreateSecretSymlinks(); err != nil {
67+
return nil, err
6368
}
64-
if err != nil {
69+
if err := c.CreateConfigSymlinks(); err != nil {
6570
return nil, err
6671
}
6772
}
@@ -70,6 +75,10 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
7075
mounts = append(mounts, m...)
7176
}
7277

78+
if m := c.ConfigMounts(); m != nil {
79+
mounts = append(mounts, m...)
80+
}
81+
7382
for _, mount := range mounts {
7483
m := specs.Mount{
7584
Source: mount.Source,

0 commit comments

Comments
 (0)