2017-11-01 19:37:53 -04:00
|
|
|
// +build linux freebsd
|
2015-11-12 14:55:17 -05:00
|
|
|
|
|
|
|
package container
|
|
|
|
|
|
|
|
import (
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
|
|
|
|
2017-02-22 12:11:10 -05:00
|
|
|
"github.com/docker/docker/api/types"
|
2016-09-06 14:18:12 -04:00
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
2016-09-22 16:14:15 -04:00
|
|
|
mounttypes "github.com/docker/docker/api/types/mount"
|
2015-11-12 14:55:17 -05:00
|
|
|
"github.com/docker/docker/pkg/chrootarchive"
|
2017-05-22 03:15:04 -04:00
|
|
|
"github.com/docker/docker/pkg/mount"
|
2016-03-07 21:41:44 -05:00
|
|
|
"github.com/docker/docker/pkg/stringid"
|
2015-11-12 14:55:17 -05:00
|
|
|
"github.com/docker/docker/pkg/system"
|
|
|
|
"github.com/docker/docker/volume"
|
2017-04-18 09:26:36 -04:00
|
|
|
"github.com/opencontainers/selinux/go-selinux/label"
|
Implement none, private, and shareable ipc modes
Since the commit d88fe447df0e8 ("Add support for sharing /dev/shm/ and
/dev/mqueue between containers") container's /dev/shm is mounted on the
host first, then bind-mounted inside the container. This is done that
way in order to be able to share this container's IPC namespace
(and the /dev/shm mount point) with another container.
Unfortunately, this functionality breaks container checkpoint/restore
(even if IPC is not shared). Since /dev/shm is an external mount, its
contents is not saved by `criu checkpoint`, and so upon restore any
application that tries to access data under /dev/shm is severily
disappointed (which usually results in a fatal crash).
This commit solves the issue by introducing new IPC modes for containers
(in addition to 'host' and 'container:ID'). The new modes are:
- 'shareable': enables sharing this container's IPC with others
(this used to be the implicit default);
- 'private': disables sharing this container's IPC.
In 'private' mode, container's /dev/shm is truly mounted inside the
container, without any bind-mounting from the host, which solves the
issue.
While at it, let's also implement 'none' mode. The motivation, as
eloquently put by Justin Cormack, is:
> I wondered a while back about having a none shm mode, as currently it is
> not possible to have a totally unwriteable container as there is always
> a /dev/shm writeable mount. It is a bit of a niche case (and clearly
> should never be allowed to be daemon default) but it would be trivial to
> add now so maybe we should...
...so here's yet yet another mode:
- 'none': no /dev/shm mount inside the container (though it still
has its own private IPC namespace).
Now, to ultimately solve the abovementioned checkpoint/restore issue, we'd
need to make 'private' the default mode, but unfortunately it breaks the
backward compatibility. So, let's make the default container IPC mode
per-daemon configurable (with the built-in default set to 'shareable'
for now). The default can be changed either via a daemon CLI option
(--default-shm-mode) or a daemon.json configuration file parameter
of the same name.
Note one can only set either 'shareable' or 'private' IPC modes as a
daemon default (i.e. in this context 'host', 'container', or 'none'
do not make much sense).
Some other changes this patch introduces are:
1. A mount for /dev/shm is added to default OCI Linux spec.
2. IpcMode.Valid() is simplified to remove duplicated code that parsed
'container:ID' form. Note the old version used to check that ID does
not contain a semicolon -- this is no longer the case (tests are
modified accordingly). The motivation is we should either do a
proper check for container ID validity, or don't check it at all
(since it is checked in other places anyway). I chose the latter.
3. IpcMode.Container() is modified to not return container ID if the
mode value does not start with "container:", unifying the check to
be the same as in IpcMode.IsContainer().
3. IPC mode unit tests (runconfig/hostconfig_test.go) are modified
to add checks for newly added values.
[v2: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-51345997]
[v3: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-53902833]
[v4: addressed the case of upgrading from older daemon, in this case
container.HostConfig.IpcMode is unset and this is valid]
[v5: document old and new IpcMode values in api/swagger.yaml]
[v6: add the 'none' mode, changelog entry to docs/api/version-history.md]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-06-27 17:58:50 -04:00
|
|
|
"github.com/pkg/errors"
|
2017-07-26 17:42:13 -04:00
|
|
|
"github.com/sirupsen/logrus"
|
2016-06-07 03:45:21 -04:00
|
|
|
"golang.org/x/sys/unix"
|
2015-11-12 14:55:17 -05:00
|
|
|
)
|
|
|
|
|
2016-10-19 12:22:02 -04:00
|
|
|
const (
|
2017-10-12 19:31:33 -04:00
|
|
|
// DefaultStopTimeout is the timeout (in seconds) for the syscall signal used to stop a container.
|
|
|
|
DefaultStopTimeout = 10
|
|
|
|
|
2016-12-25 04:11:12 -05:00
|
|
|
containerSecretMountPath = "/run/secrets"
|
2016-10-19 12:22:02 -04:00
|
|
|
)
|
2015-11-12 14:55:17 -05:00
|
|
|
|
|
|
|
// TrySetNetworkMount attempts to set the network mounts given a provided destination and
|
|
|
|
// the path to use for it; return true if the given destination was a network mount file
|
|
|
|
func (container *Container) TrySetNetworkMount(destination string, path string) bool {
|
|
|
|
if destination == "/etc/resolv.conf" {
|
|
|
|
container.ResolvConfPath = path
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
if destination == "/etc/hostname" {
|
|
|
|
container.HostnamePath = path
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
if destination == "/etc/hosts" {
|
|
|
|
container.HostsPath = path
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
// BuildHostnameFile writes the container's hostname file.
|
|
|
|
func (container *Container) BuildHostnameFile() error {
|
|
|
|
hostnamePath, err := container.GetRootResourcePath("hostname")
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
container.HostnamePath = hostnamePath
|
|
|
|
return ioutil.WriteFile(container.HostnamePath, []byte(container.Config.Hostname+"\n"), 0644)
|
|
|
|
}
|
|
|
|
|
|
|
|
// NetworkMounts returns the list of network mounts.
|
2016-03-18 14:50:19 -04:00
|
|
|
func (container *Container) NetworkMounts() []Mount {
|
|
|
|
var mounts []Mount
|
2015-11-12 14:55:17 -05:00
|
|
|
shared := container.HostConfig.NetworkMode.IsContainer()
|
2017-09-13 15:49:04 -04:00
|
|
|
parser := volume.NewParser(container.OS)
|
2015-11-12 14:55:17 -05:00
|
|
|
if container.ResolvConfPath != "" {
|
|
|
|
if _, err := os.Stat(container.ResolvConfPath); err != nil {
|
|
|
|
logrus.Warnf("ResolvConfPath set to %q, but can't stat this filename (err = %v); skipping", container.ResolvConfPath, err)
|
|
|
|
} else {
|
2016-05-25 15:59:55 -04:00
|
|
|
if !container.HasMountFor("/etc/resolv.conf") {
|
|
|
|
label.Relabel(container.ResolvConfPath, container.MountLabel, shared)
|
|
|
|
}
|
2015-11-12 14:55:17 -05:00
|
|
|
writable := !container.HostConfig.ReadonlyRootfs
|
|
|
|
if m, exists := container.MountPoints["/etc/resolv.conf"]; exists {
|
|
|
|
writable = m.RW
|
|
|
|
}
|
2016-03-18 14:50:19 -04:00
|
|
|
mounts = append(mounts, Mount{
|
2015-11-12 14:55:17 -05:00
|
|
|
Source: container.ResolvConfPath,
|
|
|
|
Destination: "/etc/resolv.conf",
|
|
|
|
Writable: writable,
|
2017-08-01 13:32:44 -04:00
|
|
|
Propagation: string(parser.DefaultPropagationMode()),
|
2015-11-12 14:55:17 -05:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if container.HostnamePath != "" {
|
|
|
|
if _, err := os.Stat(container.HostnamePath); err != nil {
|
|
|
|
logrus.Warnf("HostnamePath set to %q, but can't stat this filename (err = %v); skipping", container.HostnamePath, err)
|
|
|
|
} else {
|
2016-05-25 15:59:55 -04:00
|
|
|
if !container.HasMountFor("/etc/hostname") {
|
|
|
|
label.Relabel(container.HostnamePath, container.MountLabel, shared)
|
|
|
|
}
|
2015-11-12 14:55:17 -05:00
|
|
|
writable := !container.HostConfig.ReadonlyRootfs
|
|
|
|
if m, exists := container.MountPoints["/etc/hostname"]; exists {
|
|
|
|
writable = m.RW
|
|
|
|
}
|
2016-03-18 14:50:19 -04:00
|
|
|
mounts = append(mounts, Mount{
|
2015-11-12 14:55:17 -05:00
|
|
|
Source: container.HostnamePath,
|
|
|
|
Destination: "/etc/hostname",
|
|
|
|
Writable: writable,
|
2017-08-01 13:32:44 -04:00
|
|
|
Propagation: string(parser.DefaultPropagationMode()),
|
2015-11-12 14:55:17 -05:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if container.HostsPath != "" {
|
|
|
|
if _, err := os.Stat(container.HostsPath); err != nil {
|
|
|
|
logrus.Warnf("HostsPath set to %q, but can't stat this filename (err = %v); skipping", container.HostsPath, err)
|
|
|
|
} else {
|
2016-05-25 15:59:55 -04:00
|
|
|
if !container.HasMountFor("/etc/hosts") {
|
|
|
|
label.Relabel(container.HostsPath, container.MountLabel, shared)
|
|
|
|
}
|
2015-11-12 14:55:17 -05:00
|
|
|
writable := !container.HostConfig.ReadonlyRootfs
|
|
|
|
if m, exists := container.MountPoints["/etc/hosts"]; exists {
|
|
|
|
writable = m.RW
|
|
|
|
}
|
2016-03-18 14:50:19 -04:00
|
|
|
mounts = append(mounts, Mount{
|
2015-11-12 14:55:17 -05:00
|
|
|
Source: container.HostsPath,
|
|
|
|
Destination: "/etc/hosts",
|
|
|
|
Writable: writable,
|
2017-08-01 13:32:44 -04:00
|
|
|
Propagation: string(parser.DefaultPropagationMode()),
|
2015-11-12 14:55:17 -05:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mounts
|
|
|
|
}
|
|
|
|
|
|
|
|
// CopyImagePathContent copies files in destination to the volume.
|
|
|
|
func (container *Container) CopyImagePathContent(v volume.Volume, destination string) error {
|
2017-08-03 20:22:00 -04:00
|
|
|
rootfs, err := container.GetResourcePath(destination)
|
2015-11-12 14:55:17 -05:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, err = ioutil.ReadDir(rootfs); err != nil {
|
|
|
|
if os.IsNotExist(err) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2016-03-07 21:41:44 -05:00
|
|
|
id := stringid.GenerateNonCryptoID()
|
|
|
|
path, err := v.Mount(id)
|
2015-11-12 14:55:17 -05:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-03-07 21:41:44 -05:00
|
|
|
|
|
|
|
defer func() {
|
|
|
|
if err := v.Unmount(id); err != nil {
|
|
|
|
logrus.Warnf("error while unmounting volume %s: %v", v.Name(), err)
|
|
|
|
}
|
|
|
|
}()
|
2016-06-07 03:45:21 -04:00
|
|
|
if err := label.Relabel(path, container.MountLabel, true); err != nil && err != unix.ENOTSUP {
|
2016-05-26 11:11:28 -04:00
|
|
|
return err
|
|
|
|
}
|
2016-03-14 23:31:42 -04:00
|
|
|
return copyExistingContents(rootfs, path)
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// ShmResourcePath returns path to shm
|
|
|
|
func (container *Container) ShmResourcePath() (string, error) {
|
|
|
|
return container.GetRootResourcePath("shm")
|
|
|
|
}
|
|
|
|
|
|
|
|
// HasMountFor checks if path is a mountpoint
|
|
|
|
func (container *Container) HasMountFor(path string) bool {
|
|
|
|
_, exists := container.MountPoints[path]
|
|
|
|
return exists
|
|
|
|
}
|
|
|
|
|
Implement none, private, and shareable ipc modes
Since the commit d88fe447df0e8 ("Add support for sharing /dev/shm/ and
/dev/mqueue between containers") container's /dev/shm is mounted on the
host first, then bind-mounted inside the container. This is done that
way in order to be able to share this container's IPC namespace
(and the /dev/shm mount point) with another container.
Unfortunately, this functionality breaks container checkpoint/restore
(even if IPC is not shared). Since /dev/shm is an external mount, its
contents is not saved by `criu checkpoint`, and so upon restore any
application that tries to access data under /dev/shm is severily
disappointed (which usually results in a fatal crash).
This commit solves the issue by introducing new IPC modes for containers
(in addition to 'host' and 'container:ID'). The new modes are:
- 'shareable': enables sharing this container's IPC with others
(this used to be the implicit default);
- 'private': disables sharing this container's IPC.
In 'private' mode, container's /dev/shm is truly mounted inside the
container, without any bind-mounting from the host, which solves the
issue.
While at it, let's also implement 'none' mode. The motivation, as
eloquently put by Justin Cormack, is:
> I wondered a while back about having a none shm mode, as currently it is
> not possible to have a totally unwriteable container as there is always
> a /dev/shm writeable mount. It is a bit of a niche case (and clearly
> should never be allowed to be daemon default) but it would be trivial to
> add now so maybe we should...
...so here's yet yet another mode:
- 'none': no /dev/shm mount inside the container (though it still
has its own private IPC namespace).
Now, to ultimately solve the abovementioned checkpoint/restore issue, we'd
need to make 'private' the default mode, but unfortunately it breaks the
backward compatibility. So, let's make the default container IPC mode
per-daemon configurable (with the built-in default set to 'shareable'
for now). The default can be changed either via a daemon CLI option
(--default-shm-mode) or a daemon.json configuration file parameter
of the same name.
Note one can only set either 'shareable' or 'private' IPC modes as a
daemon default (i.e. in this context 'host', 'container', or 'none'
do not make much sense).
Some other changes this patch introduces are:
1. A mount for /dev/shm is added to default OCI Linux spec.
2. IpcMode.Valid() is simplified to remove duplicated code that parsed
'container:ID' form. Note the old version used to check that ID does
not contain a semicolon -- this is no longer the case (tests are
modified accordingly). The motivation is we should either do a
proper check for container ID validity, or don't check it at all
(since it is checked in other places anyway). I chose the latter.
3. IpcMode.Container() is modified to not return container ID if the
mode value does not start with "container:", unifying the check to
be the same as in IpcMode.IsContainer().
3. IPC mode unit tests (runconfig/hostconfig_test.go) are modified
to add checks for newly added values.
[v2: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-51345997]
[v3: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-53902833]
[v4: addressed the case of upgrading from older daemon, in this case
container.HostConfig.IpcMode is unset and this is valid]
[v5: document old and new IpcMode values in api/swagger.yaml]
[v6: add the 'none' mode, changelog entry to docs/api/version-history.md]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-06-27 17:58:50 -04:00
|
|
|
// UnmountIpcMount uses the provided unmount function to unmount shm if it was mounted
|
|
|
|
func (container *Container) UnmountIpcMount(unmount func(pth string) error) error {
|
|
|
|
if container.HasMountFor("/dev/shm") {
|
|
|
|
return nil
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
|
|
|
|
Implement none, private, and shareable ipc modes
Since the commit d88fe447df0e8 ("Add support for sharing /dev/shm/ and
/dev/mqueue between containers") container's /dev/shm is mounted on the
host first, then bind-mounted inside the container. This is done that
way in order to be able to share this container's IPC namespace
(and the /dev/shm mount point) with another container.
Unfortunately, this functionality breaks container checkpoint/restore
(even if IPC is not shared). Since /dev/shm is an external mount, its
contents is not saved by `criu checkpoint`, and so upon restore any
application that tries to access data under /dev/shm is severily
disappointed (which usually results in a fatal crash).
This commit solves the issue by introducing new IPC modes for containers
(in addition to 'host' and 'container:ID'). The new modes are:
- 'shareable': enables sharing this container's IPC with others
(this used to be the implicit default);
- 'private': disables sharing this container's IPC.
In 'private' mode, container's /dev/shm is truly mounted inside the
container, without any bind-mounting from the host, which solves the
issue.
While at it, let's also implement 'none' mode. The motivation, as
eloquently put by Justin Cormack, is:
> I wondered a while back about having a none shm mode, as currently it is
> not possible to have a totally unwriteable container as there is always
> a /dev/shm writeable mount. It is a bit of a niche case (and clearly
> should never be allowed to be daemon default) but it would be trivial to
> add now so maybe we should...
...so here's yet yet another mode:
- 'none': no /dev/shm mount inside the container (though it still
has its own private IPC namespace).
Now, to ultimately solve the abovementioned checkpoint/restore issue, we'd
need to make 'private' the default mode, but unfortunately it breaks the
backward compatibility. So, let's make the default container IPC mode
per-daemon configurable (with the built-in default set to 'shareable'
for now). The default can be changed either via a daemon CLI option
(--default-shm-mode) or a daemon.json configuration file parameter
of the same name.
Note one can only set either 'shareable' or 'private' IPC modes as a
daemon default (i.e. in this context 'host', 'container', or 'none'
do not make much sense).
Some other changes this patch introduces are:
1. A mount for /dev/shm is added to default OCI Linux spec.
2. IpcMode.Valid() is simplified to remove duplicated code that parsed
'container:ID' form. Note the old version used to check that ID does
not contain a semicolon -- this is no longer the case (tests are
modified accordingly). The motivation is we should either do a
proper check for container ID validity, or don't check it at all
(since it is checked in other places anyway). I chose the latter.
3. IpcMode.Container() is modified to not return container ID if the
mode value does not start with "container:", unifying the check to
be the same as in IpcMode.IsContainer().
3. IPC mode unit tests (runconfig/hostconfig_test.go) are modified
to add checks for newly added values.
[v2: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-51345997]
[v3: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-53902833]
[v4: addressed the case of upgrading from older daemon, in this case
container.HostConfig.IpcMode is unset and this is valid]
[v5: document old and new IpcMode values in api/swagger.yaml]
[v6: add the 'none' mode, changelog entry to docs/api/version-history.md]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-06-27 17:58:50 -04:00
|
|
|
// container.ShmPath should not be used here as it may point
|
|
|
|
// to the host's or other container's /dev/shm
|
|
|
|
shmPath, err := container.ShmResourcePath()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
Implement none, private, and shareable ipc modes
Since the commit d88fe447df0e8 ("Add support for sharing /dev/shm/ and
/dev/mqueue between containers") container's /dev/shm is mounted on the
host first, then bind-mounted inside the container. This is done that
way in order to be able to share this container's IPC namespace
(and the /dev/shm mount point) with another container.
Unfortunately, this functionality breaks container checkpoint/restore
(even if IPC is not shared). Since /dev/shm is an external mount, its
contents is not saved by `criu checkpoint`, and so upon restore any
application that tries to access data under /dev/shm is severily
disappointed (which usually results in a fatal crash).
This commit solves the issue by introducing new IPC modes for containers
(in addition to 'host' and 'container:ID'). The new modes are:
- 'shareable': enables sharing this container's IPC with others
(this used to be the implicit default);
- 'private': disables sharing this container's IPC.
In 'private' mode, container's /dev/shm is truly mounted inside the
container, without any bind-mounting from the host, which solves the
issue.
While at it, let's also implement 'none' mode. The motivation, as
eloquently put by Justin Cormack, is:
> I wondered a while back about having a none shm mode, as currently it is
> not possible to have a totally unwriteable container as there is always
> a /dev/shm writeable mount. It is a bit of a niche case (and clearly
> should never be allowed to be daemon default) but it would be trivial to
> add now so maybe we should...
...so here's yet yet another mode:
- 'none': no /dev/shm mount inside the container (though it still
has its own private IPC namespace).
Now, to ultimately solve the abovementioned checkpoint/restore issue, we'd
need to make 'private' the default mode, but unfortunately it breaks the
backward compatibility. So, let's make the default container IPC mode
per-daemon configurable (with the built-in default set to 'shareable'
for now). The default can be changed either via a daemon CLI option
(--default-shm-mode) or a daemon.json configuration file parameter
of the same name.
Note one can only set either 'shareable' or 'private' IPC modes as a
daemon default (i.e. in this context 'host', 'container', or 'none'
do not make much sense).
Some other changes this patch introduces are:
1. A mount for /dev/shm is added to default OCI Linux spec.
2. IpcMode.Valid() is simplified to remove duplicated code that parsed
'container:ID' form. Note the old version used to check that ID does
not contain a semicolon -- this is no longer the case (tests are
modified accordingly). The motivation is we should either do a
proper check for container ID validity, or don't check it at all
(since it is checked in other places anyway). I chose the latter.
3. IpcMode.Container() is modified to not return container ID if the
mode value does not start with "container:", unifying the check to
be the same as in IpcMode.IsContainer().
3. IPC mode unit tests (runconfig/hostconfig_test.go) are modified
to add checks for newly added values.
[v2: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-51345997]
[v3: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-53902833]
[v4: addressed the case of upgrading from older daemon, in this case
container.HostConfig.IpcMode is unset and this is valid]
[v5: document old and new IpcMode values in api/swagger.yaml]
[v6: add the 'none' mode, changelog entry to docs/api/version-history.md]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-06-27 17:58:50 -04:00
|
|
|
if shmPath == "" {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if err = unmount(shmPath); err != nil && !os.IsNotExist(err) {
|
|
|
|
if mounted, mErr := mount.Mounted(shmPath); mounted || mErr != nil {
|
|
|
|
return errors.Wrapf(err, "umount %s", shmPath)
|
|
|
|
}
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
Implement none, private, and shareable ipc modes
Since the commit d88fe447df0e8 ("Add support for sharing /dev/shm/ and
/dev/mqueue between containers") container's /dev/shm is mounted on the
host first, then bind-mounted inside the container. This is done that
way in order to be able to share this container's IPC namespace
(and the /dev/shm mount point) with another container.
Unfortunately, this functionality breaks container checkpoint/restore
(even if IPC is not shared). Since /dev/shm is an external mount, its
contents is not saved by `criu checkpoint`, and so upon restore any
application that tries to access data under /dev/shm is severily
disappointed (which usually results in a fatal crash).
This commit solves the issue by introducing new IPC modes for containers
(in addition to 'host' and 'container:ID'). The new modes are:
- 'shareable': enables sharing this container's IPC with others
(this used to be the implicit default);
- 'private': disables sharing this container's IPC.
In 'private' mode, container's /dev/shm is truly mounted inside the
container, without any bind-mounting from the host, which solves the
issue.
While at it, let's also implement 'none' mode. The motivation, as
eloquently put by Justin Cormack, is:
> I wondered a while back about having a none shm mode, as currently it is
> not possible to have a totally unwriteable container as there is always
> a /dev/shm writeable mount. It is a bit of a niche case (and clearly
> should never be allowed to be daemon default) but it would be trivial to
> add now so maybe we should...
...so here's yet yet another mode:
- 'none': no /dev/shm mount inside the container (though it still
has its own private IPC namespace).
Now, to ultimately solve the abovementioned checkpoint/restore issue, we'd
need to make 'private' the default mode, but unfortunately it breaks the
backward compatibility. So, let's make the default container IPC mode
per-daemon configurable (with the built-in default set to 'shareable'
for now). The default can be changed either via a daemon CLI option
(--default-shm-mode) or a daemon.json configuration file parameter
of the same name.
Note one can only set either 'shareable' or 'private' IPC modes as a
daemon default (i.e. in this context 'host', 'container', or 'none'
do not make much sense).
Some other changes this patch introduces are:
1. A mount for /dev/shm is added to default OCI Linux spec.
2. IpcMode.Valid() is simplified to remove duplicated code that parsed
'container:ID' form. Note the old version used to check that ID does
not contain a semicolon -- this is no longer the case (tests are
modified accordingly). The motivation is we should either do a
proper check for container ID validity, or don't check it at all
(since it is checked in other places anyway). I chose the latter.
3. IpcMode.Container() is modified to not return container ID if the
mode value does not start with "container:", unifying the check to
be the same as in IpcMode.IsContainer().
3. IPC mode unit tests (runconfig/hostconfig_test.go) are modified
to add checks for newly added values.
[v2: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-51345997]
[v3: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-53902833]
[v4: addressed the case of upgrading from older daemon, in this case
container.HostConfig.IpcMode is unset and this is valid]
[v5: document old and new IpcMode values in api/swagger.yaml]
[v6: add the 'none' mode, changelog entry to docs/api/version-history.md]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-06-27 17:58:50 -04:00
|
|
|
return nil
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// IpcMounts returns the list of IPC mounts
|
2016-03-18 14:50:19 -04:00
|
|
|
func (container *Container) IpcMounts() []Mount {
|
|
|
|
var mounts []Mount
|
2017-09-13 15:49:04 -04:00
|
|
|
parser := volume.NewParser(container.OS)
|
2015-11-12 14:55:17 -05:00
|
|
|
|
Implement none, private, and shareable ipc modes
Since the commit d88fe447df0e8 ("Add support for sharing /dev/shm/ and
/dev/mqueue between containers") container's /dev/shm is mounted on the
host first, then bind-mounted inside the container. This is done that
way in order to be able to share this container's IPC namespace
(and the /dev/shm mount point) with another container.
Unfortunately, this functionality breaks container checkpoint/restore
(even if IPC is not shared). Since /dev/shm is an external mount, its
contents is not saved by `criu checkpoint`, and so upon restore any
application that tries to access data under /dev/shm is severily
disappointed (which usually results in a fatal crash).
This commit solves the issue by introducing new IPC modes for containers
(in addition to 'host' and 'container:ID'). The new modes are:
- 'shareable': enables sharing this container's IPC with others
(this used to be the implicit default);
- 'private': disables sharing this container's IPC.
In 'private' mode, container's /dev/shm is truly mounted inside the
container, without any bind-mounting from the host, which solves the
issue.
While at it, let's also implement 'none' mode. The motivation, as
eloquently put by Justin Cormack, is:
> I wondered a while back about having a none shm mode, as currently it is
> not possible to have a totally unwriteable container as there is always
> a /dev/shm writeable mount. It is a bit of a niche case (and clearly
> should never be allowed to be daemon default) but it would be trivial to
> add now so maybe we should...
...so here's yet yet another mode:
- 'none': no /dev/shm mount inside the container (though it still
has its own private IPC namespace).
Now, to ultimately solve the abovementioned checkpoint/restore issue, we'd
need to make 'private' the default mode, but unfortunately it breaks the
backward compatibility. So, let's make the default container IPC mode
per-daemon configurable (with the built-in default set to 'shareable'
for now). The default can be changed either via a daemon CLI option
(--default-shm-mode) or a daemon.json configuration file parameter
of the same name.
Note one can only set either 'shareable' or 'private' IPC modes as a
daemon default (i.e. in this context 'host', 'container', or 'none'
do not make much sense).
Some other changes this patch introduces are:
1. A mount for /dev/shm is added to default OCI Linux spec.
2. IpcMode.Valid() is simplified to remove duplicated code that parsed
'container:ID' form. Note the old version used to check that ID does
not contain a semicolon -- this is no longer the case (tests are
modified accordingly). The motivation is we should either do a
proper check for container ID validity, or don't check it at all
(since it is checked in other places anyway). I chose the latter.
3. IpcMode.Container() is modified to not return container ID if the
mode value does not start with "container:", unifying the check to
be the same as in IpcMode.IsContainer().
3. IPC mode unit tests (runconfig/hostconfig_test.go) are modified
to add checks for newly added values.
[v2: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-51345997]
[v3: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-53902833]
[v4: addressed the case of upgrading from older daemon, in this case
container.HostConfig.IpcMode is unset and this is valid]
[v5: document old and new IpcMode values in api/swagger.yaml]
[v6: add the 'none' mode, changelog entry to docs/api/version-history.md]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-06-27 17:58:50 -04:00
|
|
|
if container.HasMountFor("/dev/shm") {
|
|
|
|
return mounts
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
Implement none, private, and shareable ipc modes
Since the commit d88fe447df0e8 ("Add support for sharing /dev/shm/ and
/dev/mqueue between containers") container's /dev/shm is mounted on the
host first, then bind-mounted inside the container. This is done that
way in order to be able to share this container's IPC namespace
(and the /dev/shm mount point) with another container.
Unfortunately, this functionality breaks container checkpoint/restore
(even if IPC is not shared). Since /dev/shm is an external mount, its
contents is not saved by `criu checkpoint`, and so upon restore any
application that tries to access data under /dev/shm is severily
disappointed (which usually results in a fatal crash).
This commit solves the issue by introducing new IPC modes for containers
(in addition to 'host' and 'container:ID'). The new modes are:
- 'shareable': enables sharing this container's IPC with others
(this used to be the implicit default);
- 'private': disables sharing this container's IPC.
In 'private' mode, container's /dev/shm is truly mounted inside the
container, without any bind-mounting from the host, which solves the
issue.
While at it, let's also implement 'none' mode. The motivation, as
eloquently put by Justin Cormack, is:
> I wondered a while back about having a none shm mode, as currently it is
> not possible to have a totally unwriteable container as there is always
> a /dev/shm writeable mount. It is a bit of a niche case (and clearly
> should never be allowed to be daemon default) but it would be trivial to
> add now so maybe we should...
...so here's yet yet another mode:
- 'none': no /dev/shm mount inside the container (though it still
has its own private IPC namespace).
Now, to ultimately solve the abovementioned checkpoint/restore issue, we'd
need to make 'private' the default mode, but unfortunately it breaks the
backward compatibility. So, let's make the default container IPC mode
per-daemon configurable (with the built-in default set to 'shareable'
for now). The default can be changed either via a daemon CLI option
(--default-shm-mode) or a daemon.json configuration file parameter
of the same name.
Note one can only set either 'shareable' or 'private' IPC modes as a
daemon default (i.e. in this context 'host', 'container', or 'none'
do not make much sense).
Some other changes this patch introduces are:
1. A mount for /dev/shm is added to default OCI Linux spec.
2. IpcMode.Valid() is simplified to remove duplicated code that parsed
'container:ID' form. Note the old version used to check that ID does
not contain a semicolon -- this is no longer the case (tests are
modified accordingly). The motivation is we should either do a
proper check for container ID validity, or don't check it at all
(since it is checked in other places anyway). I chose the latter.
3. IpcMode.Container() is modified to not return container ID if the
mode value does not start with "container:", unifying the check to
be the same as in IpcMode.IsContainer().
3. IPC mode unit tests (runconfig/hostconfig_test.go) are modified
to add checks for newly added values.
[v2: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-51345997]
[v3: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-53902833]
[v4: addressed the case of upgrading from older daemon, in this case
container.HostConfig.IpcMode is unset and this is valid]
[v5: document old and new IpcMode values in api/swagger.yaml]
[v6: add the 'none' mode, changelog entry to docs/api/version-history.md]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-06-27 17:58:50 -04:00
|
|
|
if container.ShmPath == "" {
|
|
|
|
return mounts
|
|
|
|
}
|
|
|
|
|
|
|
|
label.SetFileLabel(container.ShmPath, container.MountLabel)
|
|
|
|
mounts = append(mounts, Mount{
|
|
|
|
Source: container.ShmPath,
|
|
|
|
Destination: "/dev/shm",
|
|
|
|
Writable: true,
|
2017-08-01 13:32:44 -04:00
|
|
|
Propagation: string(parser.DefaultPropagationMode()),
|
Implement none, private, and shareable ipc modes
Since the commit d88fe447df0e8 ("Add support for sharing /dev/shm/ and
/dev/mqueue between containers") container's /dev/shm is mounted on the
host first, then bind-mounted inside the container. This is done that
way in order to be able to share this container's IPC namespace
(and the /dev/shm mount point) with another container.
Unfortunately, this functionality breaks container checkpoint/restore
(even if IPC is not shared). Since /dev/shm is an external mount, its
contents is not saved by `criu checkpoint`, and so upon restore any
application that tries to access data under /dev/shm is severily
disappointed (which usually results in a fatal crash).
This commit solves the issue by introducing new IPC modes for containers
(in addition to 'host' and 'container:ID'). The new modes are:
- 'shareable': enables sharing this container's IPC with others
(this used to be the implicit default);
- 'private': disables sharing this container's IPC.
In 'private' mode, container's /dev/shm is truly mounted inside the
container, without any bind-mounting from the host, which solves the
issue.
While at it, let's also implement 'none' mode. The motivation, as
eloquently put by Justin Cormack, is:
> I wondered a while back about having a none shm mode, as currently it is
> not possible to have a totally unwriteable container as there is always
> a /dev/shm writeable mount. It is a bit of a niche case (and clearly
> should never be allowed to be daemon default) but it would be trivial to
> add now so maybe we should...
...so here's yet yet another mode:
- 'none': no /dev/shm mount inside the container (though it still
has its own private IPC namespace).
Now, to ultimately solve the abovementioned checkpoint/restore issue, we'd
need to make 'private' the default mode, but unfortunately it breaks the
backward compatibility. So, let's make the default container IPC mode
per-daemon configurable (with the built-in default set to 'shareable'
for now). The default can be changed either via a daemon CLI option
(--default-shm-mode) or a daemon.json configuration file parameter
of the same name.
Note one can only set either 'shareable' or 'private' IPC modes as a
daemon default (i.e. in this context 'host', 'container', or 'none'
do not make much sense).
Some other changes this patch introduces are:
1. A mount for /dev/shm is added to default OCI Linux spec.
2. IpcMode.Valid() is simplified to remove duplicated code that parsed
'container:ID' form. Note the old version used to check that ID does
not contain a semicolon -- this is no longer the case (tests are
modified accordingly). The motivation is we should either do a
proper check for container ID validity, or don't check it at all
(since it is checked in other places anyway). I chose the latter.
3. IpcMode.Container() is modified to not return container ID if the
mode value does not start with "container:", unifying the check to
be the same as in IpcMode.IsContainer().
3. IPC mode unit tests (runconfig/hostconfig_test.go) are modified
to add checks for newly added values.
[v2: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-51345997]
[v3: addressed review at https://github.com/moby/moby/pull/34087#pullrequestreview-53902833]
[v4: addressed the case of upgrading from older daemon, in this case
container.HostConfig.IpcMode is unset and this is valid]
[v5: document old and new IpcMode values in api/swagger.yaml]
[v6: add the 'none' mode, changelog entry to docs/api/version-history.md]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-06-27 17:58:50 -04:00
|
|
|
})
|
2015-11-12 14:55:17 -05:00
|
|
|
|
2016-03-18 14:50:19 -04:00
|
|
|
return mounts
|
2015-12-28 06:19:26 -05:00
|
|
|
}
|
|
|
|
|
2017-04-28 14:48:52 -04:00
|
|
|
// SecretMounts returns the mounts for the secret path.
|
2017-04-11 13:34:19 -04:00
|
|
|
func (container *Container) SecretMounts() []Mount {
|
|
|
|
var mounts []Mount
|
|
|
|
for _, r := range container.SecretReferences {
|
2017-04-28 14:48:52 -04:00
|
|
|
if r.File == nil {
|
|
|
|
continue
|
|
|
|
}
|
2017-04-11 13:34:19 -04:00
|
|
|
mounts = append(mounts, Mount{
|
2017-04-28 14:48:52 -04:00
|
|
|
Source: container.SecretFilePath(*r),
|
2017-04-11 13:34:19 -04:00
|
|
|
Destination: getSecretTargetPath(r),
|
2016-10-19 12:22:02 -04:00
|
|
|
Writable: false,
|
2017-04-11 13:34:19 -04:00
|
|
|
})
|
2016-10-19 12:22:02 -04:00
|
|
|
}
|
|
|
|
|
2017-04-11 13:34:19 -04:00
|
|
|
return mounts
|
2016-10-19 12:22:02 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// UnmountSecrets unmounts the local tmpfs for secrets
|
|
|
|
func (container *Container) UnmountSecrets() error {
|
2016-10-28 20:30:22 -04:00
|
|
|
if _, err := os.Stat(container.SecretMountPath()); err != nil {
|
|
|
|
if os.IsNotExist(err) {
|
|
|
|
return nil
|
|
|
|
}
|
2016-10-31 11:53:43 -04:00
|
|
|
return err
|
2016-10-28 20:30:22 -04:00
|
|
|
}
|
|
|
|
|
2016-10-19 12:22:02 -04:00
|
|
|
return detachMounted(container.SecretMountPath())
|
|
|
|
}
|
|
|
|
|
2017-03-16 17:23:33 -04:00
|
|
|
// ConfigMounts returns the mounts for configs.
|
|
|
|
func (container *Container) ConfigMounts() []Mount {
|
|
|
|
var mounts []Mount
|
|
|
|
for _, configRef := range container.ConfigReferences {
|
|
|
|
if configRef.File == nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
mounts = append(mounts, Mount{
|
|
|
|
Source: container.ConfigFilePath(*configRef),
|
|
|
|
Destination: configRef.File.Name,
|
|
|
|
Writable: false,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
return mounts
|
|
|
|
}
|
|
|
|
|
2017-07-19 10:20:13 -04:00
|
|
|
type conflictingUpdateOptions string
|
|
|
|
|
|
|
|
func (e conflictingUpdateOptions) Error() string {
|
|
|
|
return string(e)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e conflictingUpdateOptions) Conflict() {}
|
|
|
|
|
2017-02-22 17:02:20 -05:00
|
|
|
// UpdateContainer updates configuration of a container. Callers must hold a Lock on the Container.
|
2016-01-21 23:49:02 -05:00
|
|
|
func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfig) error {
|
2016-01-04 10:58:20 -05:00
|
|
|
// update resources of container
|
2015-12-28 06:19:26 -05:00
|
|
|
resources := hostConfig.Resources
|
|
|
|
cResources := &container.HostConfig.Resources
|
2017-02-18 01:04:37 -05:00
|
|
|
|
|
|
|
// validate NanoCPUs, CPUPeriod, and CPUQuota
|
2017-05-21 19:24:07 -04:00
|
|
|
// Because NanoCPU effectively updates CPUPeriod/CPUQuota,
|
2017-02-18 01:04:37 -05:00
|
|
|
// once NanoCPU is already set, updating CPUPeriod/CPUQuota will be blocked, and vice versa.
|
|
|
|
// In the following we make sure the intended update (resources) does not conflict with the existing (cResource).
|
|
|
|
if resources.NanoCPUs > 0 && cResources.CPUPeriod > 0 {
|
2017-07-19 10:20:13 -04:00
|
|
|
return conflictingUpdateOptions("Conflicting options: Nano CPUs cannot be updated as CPU Period has already been set")
|
2017-02-18 01:04:37 -05:00
|
|
|
}
|
|
|
|
if resources.NanoCPUs > 0 && cResources.CPUQuota > 0 {
|
2017-07-19 10:20:13 -04:00
|
|
|
return conflictingUpdateOptions("Conflicting options: Nano CPUs cannot be updated as CPU Quota has already been set")
|
2017-02-18 01:04:37 -05:00
|
|
|
}
|
|
|
|
if resources.CPUPeriod > 0 && cResources.NanoCPUs > 0 {
|
2017-07-19 10:20:13 -04:00
|
|
|
return conflictingUpdateOptions("Conflicting options: CPU Period cannot be updated as NanoCPUs has already been set")
|
2017-02-18 01:04:37 -05:00
|
|
|
}
|
|
|
|
if resources.CPUQuota > 0 && cResources.NanoCPUs > 0 {
|
2017-07-19 10:20:13 -04:00
|
|
|
return conflictingUpdateOptions("Conflicting options: CPU Quota cannot be updated as NanoCPUs has already been set")
|
2017-02-18 01:04:37 -05:00
|
|
|
}
|
|
|
|
|
2015-12-28 06:19:26 -05:00
|
|
|
if resources.BlkioWeight != 0 {
|
|
|
|
cResources.BlkioWeight = resources.BlkioWeight
|
|
|
|
}
|
|
|
|
if resources.CPUShares != 0 {
|
|
|
|
cResources.CPUShares = resources.CPUShares
|
|
|
|
}
|
2017-02-18 01:04:37 -05:00
|
|
|
if resources.NanoCPUs != 0 {
|
|
|
|
cResources.NanoCPUs = resources.NanoCPUs
|
|
|
|
}
|
2015-12-28 06:19:26 -05:00
|
|
|
if resources.CPUPeriod != 0 {
|
|
|
|
cResources.CPUPeriod = resources.CPUPeriod
|
|
|
|
}
|
|
|
|
if resources.CPUQuota != 0 {
|
|
|
|
cResources.CPUQuota = resources.CPUQuota
|
|
|
|
}
|
|
|
|
if resources.CpusetCpus != "" {
|
|
|
|
cResources.CpusetCpus = resources.CpusetCpus
|
|
|
|
}
|
|
|
|
if resources.CpusetMems != "" {
|
|
|
|
cResources.CpusetMems = resources.CpusetMems
|
|
|
|
}
|
|
|
|
if resources.Memory != 0 {
|
2016-08-08 06:36:03 -04:00
|
|
|
// if memory limit smaller than already set memoryswap limit and doesn't
|
|
|
|
// update the memoryswap limit, then error out.
|
|
|
|
if resources.Memory > cResources.MemorySwap && resources.MemorySwap == 0 {
|
2017-07-19 10:20:13 -04:00
|
|
|
return conflictingUpdateOptions("Memory limit should be smaller than already set memoryswap limit, update the memoryswap at the same time")
|
2016-08-08 06:36:03 -04:00
|
|
|
}
|
2015-12-28 06:19:26 -05:00
|
|
|
cResources.Memory = resources.Memory
|
|
|
|
}
|
|
|
|
if resources.MemorySwap != 0 {
|
|
|
|
cResources.MemorySwap = resources.MemorySwap
|
|
|
|
}
|
|
|
|
if resources.MemoryReservation != 0 {
|
|
|
|
cResources.MemoryReservation = resources.MemoryReservation
|
|
|
|
}
|
|
|
|
if resources.KernelMemory != 0 {
|
|
|
|
cResources.KernelMemory = resources.KernelMemory
|
|
|
|
}
|
2016-01-04 10:58:20 -05:00
|
|
|
|
|
|
|
// update HostConfig of container
|
|
|
|
if hostConfig.RestartPolicy.Name != "" {
|
2016-08-15 04:38:47 -04:00
|
|
|
if container.HostConfig.AutoRemove && !hostConfig.RestartPolicy.IsNone() {
|
2017-07-19 10:20:13 -04:00
|
|
|
return conflictingUpdateOptions("Restart policy cannot be updated because AutoRemove is enabled for the container")
|
2016-08-15 04:38:47 -04:00
|
|
|
}
|
2016-01-04 10:58:20 -05:00
|
|
|
container.HostConfig.RestartPolicy = hostConfig.RestartPolicy
|
|
|
|
}
|
2015-12-28 06:19:26 -05:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-10-03 13:53:06 -04:00
|
|
|
// DetachAndUnmount uses a detached mount on all mount destinations, then
|
|
|
|
// unmounts each volume normally.
|
|
|
|
// This is used from daemon/archive for `docker cp`
|
|
|
|
func (container *Container) DetachAndUnmount(volumeEventLog func(name, action string, attributes map[string]string)) error {
|
|
|
|
networkMounts := container.NetworkMounts()
|
|
|
|
mountPaths := make([]string, 0, len(container.MountPoints)+len(networkMounts))
|
2015-11-12 14:55:17 -05:00
|
|
|
|
|
|
|
for _, mntPoint := range container.MountPoints {
|
|
|
|
dest, err := container.GetResourcePath(mntPoint.Destination)
|
|
|
|
if err != nil {
|
2016-10-03 13:53:06 -04:00
|
|
|
logrus.Warnf("Failed to get volume destination path for container '%s' at '%s' while lazily unmounting: %v", container.ID, mntPoint.Destination, err)
|
|
|
|
continue
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
2016-10-03 13:53:06 -04:00
|
|
|
mountPaths = append(mountPaths, dest)
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
|
|
|
|
2016-10-03 13:53:06 -04:00
|
|
|
for _, m := range networkMounts {
|
|
|
|
dest, err := container.GetResourcePath(m.Destination)
|
|
|
|
if err != nil {
|
|
|
|
logrus.Warnf("Failed to get volume destination path for container '%s' at '%s' while lazily unmounting: %v", container.ID, m.Destination, err)
|
|
|
|
continue
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
2016-10-03 13:53:06 -04:00
|
|
|
mountPaths = append(mountPaths, dest)
|
|
|
|
}
|
2015-11-12 14:55:17 -05:00
|
|
|
|
2016-10-03 13:53:06 -04:00
|
|
|
for _, mountPath := range mountPaths {
|
|
|
|
if err := detachMounted(mountPath); err != nil {
|
|
|
|
logrus.Warnf("%s unmountVolumes: Failed to do lazy umount fo volume '%s': %v", container.ID, mountPath, err)
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
|
|
|
}
|
2016-10-03 13:53:06 -04:00
|
|
|
return container.UnmountVolumes(volumeEventLog)
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// copyExistingContents copies from the source to the destination and
|
|
|
|
// ensures the ownership is appropriately set.
|
|
|
|
func copyExistingContents(source, destination string) error {
|
|
|
|
volList, err := ioutil.ReadDir(source)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if len(volList) > 0 {
|
|
|
|
srcList, err := ioutil.ReadDir(destination)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if len(srcList) == 0 {
|
2016-01-14 00:46:59 -05:00
|
|
|
// If the source volume is empty, copies files from the root into the volume
|
2017-05-24 11:53:41 -04:00
|
|
|
if err := chrootarchive.NewArchiver(nil).CopyWithTar(source, destination); err != nil {
|
2015-11-12 14:55:17 -05:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return copyOwnership(source, destination)
|
|
|
|
}
|
|
|
|
|
|
|
|
// copyOwnership copies the permissions and uid:gid of the source file
|
|
|
|
// to the destination file
|
|
|
|
func copyOwnership(source, destination string) error {
|
|
|
|
stat, err := system.Stat(source)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2017-06-15 10:27:06 -04:00
|
|
|
destStat, err := system.Stat(destination)
|
|
|
|
if err != nil {
|
2015-11-12 14:55:17 -05:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2017-06-15 10:27:06 -04:00
|
|
|
// In some cases, even though UID/GID match and it would effectively be a no-op,
|
|
|
|
// this can return a permission denied error... for example if this is an NFS
|
|
|
|
// mount.
|
|
|
|
// Since it's not really an error that we can't chown to the same UID/GID, don't
|
|
|
|
// even bother trying in such cases.
|
|
|
|
if stat.UID() != destStat.UID() || stat.GID() != destStat.GID() {
|
|
|
|
if err := os.Chown(destination, int(stat.UID()), int(stat.GID())); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if stat.Mode() != destStat.Mode() {
|
|
|
|
return os.Chmod(destination, os.FileMode(stat.Mode()))
|
|
|
|
}
|
|
|
|
return nil
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// TmpfsMounts returns the list of tmpfs mounts
|
2016-09-22 16:14:15 -04:00
|
|
|
func (container *Container) TmpfsMounts() ([]Mount, error) {
|
2017-09-13 15:49:04 -04:00
|
|
|
parser := volume.NewParser(container.OS)
|
2016-03-18 14:50:19 -04:00
|
|
|
var mounts []Mount
|
2015-11-12 14:55:17 -05:00
|
|
|
for dest, data := range container.HostConfig.Tmpfs {
|
2016-03-18 14:50:19 -04:00
|
|
|
mounts = append(mounts, Mount{
|
2015-11-12 14:55:17 -05:00
|
|
|
Source: "tmpfs",
|
|
|
|
Destination: dest,
|
|
|
|
Data: data,
|
|
|
|
})
|
|
|
|
}
|
2016-09-22 16:14:15 -04:00
|
|
|
for dest, mnt := range container.MountPoints {
|
|
|
|
if mnt.Type == mounttypes.TypeTmpfs {
|
2017-08-01 13:32:44 -04:00
|
|
|
data, err := parser.ConvertTmpfsOptions(mnt.Spec.TmpfsOptions, mnt.Spec.ReadOnly)
|
2016-09-22 16:14:15 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
mounts = append(mounts, Mount{
|
|
|
|
Source: "tmpfs",
|
|
|
|
Destination: dest,
|
|
|
|
Data: data,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mounts, nil
|
2015-11-12 14:55:17 -05:00
|
|
|
}
|
2016-01-27 16:03:09 -05:00
|
|
|
|
2016-09-12 20:17:09 -04:00
|
|
|
// EnableServiceDiscoveryOnDefaultNetwork Enable service discovery on default network
|
|
|
|
func (container *Container) EnableServiceDiscoveryOnDefaultNetwork() bool {
|
|
|
|
return false
|
|
|
|
}
|
2017-02-22 12:11:10 -05:00
|
|
|
|
|
|
|
// GetMountPoints gives a platform specific transformation to types.MountPoint. Callers must hold a Container lock.
|
|
|
|
func (container *Container) GetMountPoints() []types.MountPoint {
|
|
|
|
mountPoints := make([]types.MountPoint, 0, len(container.MountPoints))
|
|
|
|
for _, m := range container.MountPoints {
|
|
|
|
mountPoints = append(mountPoints, types.MountPoint{
|
|
|
|
Type: m.Type,
|
|
|
|
Name: m.Name,
|
|
|
|
Source: m.Path(),
|
|
|
|
Destination: m.Destination,
|
|
|
|
Driver: m.Driver,
|
|
|
|
Mode: m.Mode,
|
|
|
|
RW: m.RW,
|
|
|
|
Propagation: m.Propagation,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
return mountPoints
|
|
|
|
}
|