2018-02-05 16:05:59 -05:00
|
|
|
package daemon // import "github.com/docker/docker/daemon"
|
2014-02-14 20:15:40 -05:00
|
|
|
|
|
|
|
import (
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2017-04-25 13:05:21 -04:00
|
|
|
"reflect"
|
2014-02-14 20:15:40 -05:00
|
|
|
"strings"
|
2017-05-17 17:19:13 -04:00
|
|
|
"time"
|
2014-05-05 17:45:14 -04:00
|
|
|
|
2016-09-06 14:18:12 -04:00
|
|
|
"github.com/docker/docker/api/types"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
2018-01-18 16:55:27 -05:00
|
|
|
"github.com/docker/docker/api/types/mount"
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
mounttypes "github.com/docker/docker/api/types/mount"
|
2015-11-12 14:55:17 -05:00
|
|
|
"github.com/docker/docker/container"
|
2018-01-11 14:53:06 -05:00
|
|
|
"github.com/docker/docker/errdefs"
|
2015-05-19 16:05:25 -04:00
|
|
|
"github.com/docker/docker/volume"
|
2017-07-19 10:20:13 -04:00
|
|
|
"github.com/pkg/errors"
|
2017-07-26 17:42:13 -04:00
|
|
|
"github.com/sirupsen/logrus"
|
2014-02-14 20:15:40 -05:00
|
|
|
)
|
|
|
|
|
2015-06-12 09:25:32 -04:00
|
|
|
var (
|
|
|
|
// ErrVolumeReadonly is used to signal an error when trying to copy data into
|
|
|
|
// a volume mount that is not writable.
|
|
|
|
ErrVolumeReadonly = errors.New("mounted volume is marked read-only")
|
|
|
|
)
|
2015-05-12 21:21:26 -04:00
|
|
|
|
2016-03-18 14:50:19 -04:00
|
|
|
type mounts []container.Mount
|
2014-12-16 10:06:45 -05:00
|
|
|
|
2016-11-15 14:45:20 -05:00
|
|
|
// volumeToAPIType converts a volume.Volume to the type used by the Engine API
|
2015-09-09 22:23:06 -04:00
|
|
|
func volumeToAPIType(v volume.Volume) *types.Volume {
|
2017-05-17 17:19:13 -04:00
|
|
|
createdAt, _ := v.CreatedAt()
|
2016-03-16 17:52:34 -04:00
|
|
|
tv := &types.Volume{
|
2017-05-17 17:19:13 -04:00
|
|
|
Name: v.Name(),
|
|
|
|
Driver: v.DriverName(),
|
|
|
|
CreatedAt: createdAt.Format(time.RFC3339),
|
2014-08-21 17:57:46 -04:00
|
|
|
}
|
2016-09-17 15:32:31 -04:00
|
|
|
if v, ok := v.(volume.DetailedVolume); ok {
|
2016-03-16 17:52:34 -04:00
|
|
|
tv.Labels = v.Labels()
|
2016-09-17 15:32:31 -04:00
|
|
|
tv.Options = v.Options()
|
2016-04-11 11:17:52 -04:00
|
|
|
tv.Scope = v.Scope()
|
|
|
|
}
|
2016-09-17 15:32:31 -04:00
|
|
|
|
2016-03-16 17:52:34 -04:00
|
|
|
return tv
|
2015-09-09 22:23:06 -04:00
|
|
|
}
|
2014-08-21 17:57:46 -04:00
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
// Len returns the number of mounts. Used in sorting.
|
|
|
|
func (m mounts) Len() int {
|
|
|
|
return len(m)
|
|
|
|
}
|
2014-08-28 10:18:08 -04:00
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
// Less returns true if the number of parts (a/b/c would be 3 parts) in the
|
|
|
|
// mount indexed by parameter 1 is less than that of the mount indexed by
|
|
|
|
// parameter 2. Used in sorting.
|
|
|
|
func (m mounts) Less(i, j int) bool {
|
|
|
|
return m.parts(i) < m.parts(j)
|
2014-12-16 10:06:45 -05:00
|
|
|
}
|
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
// Swap swaps two items in an array of mounts. Used in sorting
|
|
|
|
func (m mounts) Swap(i, j int) {
|
|
|
|
m[i], m[j] = m[j], m[i]
|
|
|
|
}
|
2015-05-12 21:21:26 -04:00
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
// parts returns the number of parts in the destination of a mount. Used in sorting.
|
|
|
|
func (m mounts) parts(i int) int {
|
|
|
|
return strings.Count(filepath.Clean(m[i].Destination), string(os.PathSeparator))
|
2015-05-12 21:21:26 -04:00
|
|
|
}
|
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
// registerMountPoints initializes the container mount points with the configured volumes and bind mounts.
|
|
|
|
// It follows the next sequence to decide what to mount in each final destination:
|
|
|
|
//
|
|
|
|
// 1. Select the previously configured mount points for the containers, if any.
|
|
|
|
// 2. Select the volumes mounted from another containers. Overrides previously configured mount point destination.
|
|
|
|
// 3. Select the bind mounts set by the client. Overrides previously configured mount point destinations.
|
2015-12-13 11:00:39 -05:00
|
|
|
// 4. Cleanup old volumes that are about to be reassigned.
|
2016-05-06 22:48:02 -04:00
|
|
|
func (daemon *Daemon) registerMountPoints(container *container.Container, hostConfig *containertypes.HostConfig) (retErr error) {
|
2015-09-09 22:23:06 -04:00
|
|
|
binds := map[string]bool{}
|
|
|
|
mountPoints := map[string]*volume.MountPoint{}
|
2017-08-08 15:43:48 -04:00
|
|
|
parser := volume.NewParser(container.OS)
|
2016-05-06 22:48:02 -04:00
|
|
|
defer func() {
|
|
|
|
// clean up the container mountpoints once return with error
|
|
|
|
if retErr != nil {
|
|
|
|
for _, m := range mountPoints {
|
|
|
|
if m.Volume == nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
daemon.volumes.Dereference(m.Volume, container.ID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
2015-09-09 22:23:06 -04:00
|
|
|
|
2017-01-27 17:12:45 -05:00
|
|
|
dereferenceIfExists := func(destination string) {
|
|
|
|
if v, ok := mountPoints[destination]; ok {
|
|
|
|
logrus.Debugf("Duplicate mount point '%s'", destination)
|
|
|
|
if v.Volume != nil {
|
|
|
|
daemon.volumes.Dereference(v.Volume, container.ID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
// 1. Read already configured mount points.
|
2016-09-16 22:52:11 -04:00
|
|
|
for destination, point := range container.MountPoints {
|
|
|
|
mountPoints[destination] = point
|
2014-08-21 17:57:46 -04:00
|
|
|
}
|
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
// 2. Read volumes from other containers.
|
|
|
|
for _, v := range hostConfig.VolumesFrom {
|
2017-08-01 13:32:44 -04:00
|
|
|
containerID, mode, err := parser.ParseVolumesFrom(v)
|
2015-09-09 22:23:06 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2014-08-21 17:57:46 -04:00
|
|
|
|
2015-12-11 12:39:28 -05:00
|
|
|
c, err := daemon.GetContainer(containerID)
|
2015-09-09 22:23:06 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, m := range c.MountPoints {
|
|
|
|
cp := &volume.MountPoint{
|
2017-04-25 13:05:21 -04:00
|
|
|
Type: m.Type,
|
2015-09-09 22:23:06 -04:00
|
|
|
Name: m.Name,
|
|
|
|
Source: m.Source,
|
2017-08-01 13:32:44 -04:00
|
|
|
RW: m.RW && parser.ReadWrite(mode),
|
2015-09-09 22:23:06 -04:00
|
|
|
Driver: m.Driver,
|
|
|
|
Destination: m.Destination,
|
2015-10-23 16:57:57 -04:00
|
|
|
Propagation: m.Propagation,
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
Spec: m.Spec,
|
|
|
|
CopyData: false,
|
2015-09-09 22:23:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if len(cp.Source) == 0 {
|
2015-09-23 16:29:14 -04:00
|
|
|
v, err := daemon.volumes.GetWithRef(cp.Name, cp.Driver, container.ID)
|
2015-09-09 22:23:06 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
cp.Volume = v
|
|
|
|
}
|
2017-01-27 17:12:45 -05:00
|
|
|
dereferenceIfExists(cp.Destination)
|
2015-09-09 22:23:06 -04:00
|
|
|
mountPoints[cp.Destination] = cp
|
|
|
|
}
|
2014-05-19 18:18:37 -04:00
|
|
|
}
|
2015-09-09 22:23:06 -04:00
|
|
|
|
|
|
|
// 3. Read bind mounts
|
|
|
|
for _, b := range hostConfig.Binds {
|
2017-08-01 13:32:44 -04:00
|
|
|
bind, err := parser.ParseMountRaw(b, hostConfig.VolumeDriver)
|
2014-05-19 18:04:51 -04:00
|
|
|
if err != nil {
|
2014-03-18 18:28:40 -04:00
|
|
|
return err
|
2014-02-14 20:15:40 -05:00
|
|
|
}
|
2018-01-18 16:55:27 -05:00
|
|
|
needsSlavePropagation, err := daemon.validateBindDaemonRoot(bind.Spec)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if needsSlavePropagation {
|
|
|
|
bind.Propagation = mount.PropagationRSlave
|
|
|
|
}
|
2015-09-09 22:23:06 -04:00
|
|
|
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
// #10618
|
2016-06-06 05:57:11 -04:00
|
|
|
_, tmpfsExists := hostConfig.Tmpfs[bind.Destination]
|
|
|
|
if binds[bind.Destination] || tmpfsExists {
|
2017-07-19 10:20:13 -04:00
|
|
|
return duplicateMountPointError(bind.Destination)
|
2015-09-09 22:23:06 -04:00
|
|
|
}
|
|
|
|
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
if bind.Type == mounttypes.TypeVolume {
|
2015-09-09 22:23:06 -04:00
|
|
|
// create the volume
|
2016-03-16 17:52:34 -04:00
|
|
|
v, err := daemon.volumes.CreateWithRef(bind.Name, bind.Driver, container.ID, nil, nil)
|
2015-09-09 22:23:06 -04:00
|
|
|
if err != nil {
|
2014-02-14 20:15:40 -05:00
|
|
|
return err
|
|
|
|
}
|
2015-09-09 22:23:06 -04:00
|
|
|
bind.Volume = v
|
|
|
|
bind.Source = v.Path()
|
|
|
|
// bind.Name is an already existing volume, we need to use that here
|
|
|
|
bind.Driver = v.DriverName()
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
if bind.Driver == volume.DefaultDriverName {
|
|
|
|
setBindModeIfNull(bind)
|
2016-02-02 09:02:37 -05:00
|
|
|
}
|
2015-09-09 22:23:06 -04:00
|
|
|
}
|
2016-03-14 23:31:42 -04:00
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
binds[bind.Destination] = true
|
2017-01-27 17:12:45 -05:00
|
|
|
dereferenceIfExists(bind.Destination)
|
2015-09-09 22:23:06 -04:00
|
|
|
mountPoints[bind.Destination] = bind
|
2014-05-19 18:18:37 -04:00
|
|
|
}
|
2015-06-12 09:25:32 -04:00
|
|
|
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
for _, cfg := range hostConfig.Mounts {
|
2017-08-01 13:32:44 -04:00
|
|
|
mp, err := parser.ParseMountSpec(cfg)
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
if err != nil {
|
2017-11-28 23:09:37 -05:00
|
|
|
return errdefs.InvalidParameter(err)
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
}
|
2018-01-18 16:55:27 -05:00
|
|
|
needsSlavePropagation, err := daemon.validateBindDaemonRoot(mp.Spec)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if needsSlavePropagation {
|
|
|
|
mp.Propagation = mount.PropagationRSlave
|
|
|
|
}
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
|
|
|
|
if binds[mp.Destination] {
|
2017-07-19 10:20:13 -04:00
|
|
|
return duplicateMountPointError(cfg.Target)
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if mp.Type == mounttypes.TypeVolume {
|
|
|
|
var v volume.Volume
|
|
|
|
if cfg.VolumeOptions != nil {
|
|
|
|
var driverOpts map[string]string
|
|
|
|
if cfg.VolumeOptions.DriverConfig != nil {
|
|
|
|
driverOpts = cfg.VolumeOptions.DriverConfig.Options
|
|
|
|
}
|
|
|
|
v, err = daemon.volumes.CreateWithRef(mp.Name, mp.Driver, container.ID, driverOpts, cfg.VolumeOptions.Labels)
|
|
|
|
} else {
|
|
|
|
v, err = daemon.volumes.CreateWithRef(mp.Name, mp.Driver, container.ID, nil, nil)
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
mp.Volume = v
|
|
|
|
mp.Name = v.Name()
|
|
|
|
mp.Driver = v.DriverName()
|
|
|
|
|
2016-10-29 03:03:26 -04:00
|
|
|
// only use the cached path here since getting the path is not necessary right now and calling `Path()` may be slow
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
if cv, ok := v.(interface {
|
|
|
|
CachedPath() string
|
|
|
|
}); ok {
|
|
|
|
mp.Source = cv.CachedPath()
|
|
|
|
}
|
2017-08-30 13:10:15 -04:00
|
|
|
if mp.Driver == volume.DefaultDriverName {
|
|
|
|
setBindModeIfNull(mp)
|
|
|
|
}
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
binds[mp.Destination] = true
|
2017-01-27 17:12:45 -05:00
|
|
|
dereferenceIfExists(mp.Destination)
|
Add new `HostConfig` field, `Mounts`.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).
The new API follows exactly the services mount API.
Example usage of `Mounts`:
```
$ curl -XPOST localhost:2375/containers/create -d '{
"Image": "alpine:latest",
"HostConfig": {
"Mounts": [{
"Type": "Volume",
"Target": "/foo"
},{
"Type": "bind",
"Source": "/var/run/docker.sock",
"Target": "/var/run/docker.sock",
},{
"Type": "volume",
"Name": "important_data",
"Target": "/var/data",
"ReadOnly": true,
"VolumeOptions": {
"DriverConfig": {
Name: "awesomeStorage",
Options: {"size": "10m"},
Labels: {"some":"label"}
}
}]
}
}'
```
There are currently 2 types of mounts:
- **bind**: Paths on the host that get mounted into the
container. Paths must exist prior to creating the container.
- **volume**: Volumes that persist after the
container is removed.
Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 14:25:35 -04:00
|
|
|
mountPoints[mp.Destination] = mp
|
|
|
|
}
|
|
|
|
|
2015-09-09 22:23:06 -04:00
|
|
|
container.Lock()
|
2015-11-18 05:04:23 -05:00
|
|
|
|
2015-12-13 11:00:39 -05:00
|
|
|
// 4. Cleanup old volumes that are about to be reassigned.
|
2015-11-18 05:04:23 -05:00
|
|
|
for _, m := range mountPoints {
|
2017-08-01 13:32:44 -04:00
|
|
|
if parser.IsBackwardCompatible(m) {
|
2015-11-18 05:04:23 -05:00
|
|
|
if mp, exists := container.MountPoints[m.Destination]; exists && mp.Volume != nil {
|
2015-09-23 16:29:14 -04:00
|
|
|
daemon.volumes.Dereference(mp.Volume, container.ID)
|
2015-11-18 05:04:23 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-09-09 22:23:06 -04:00
|
|
|
container.MountPoints = mountPoints
|
|
|
|
|
|
|
|
container.Unlock()
|
|
|
|
|
|
|
|
return nil
|
2015-06-12 09:25:32 -04:00
|
|
|
}
|
2016-01-12 17:18:57 -05:00
|
|
|
|
|
|
|
// lazyInitializeVolume initializes a mountpoint's volume if needed.
|
|
|
|
// This happens after a daemon restart.
|
|
|
|
func (daemon *Daemon) lazyInitializeVolume(containerID string, m *volume.MountPoint) error {
|
|
|
|
if len(m.Driver) > 0 && m.Volume == nil {
|
|
|
|
v, err := daemon.volumes.GetWithRef(m.Name, m.Driver, containerID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
m.Volume = v
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
2016-08-04 15:34:52 -04:00
|
|
|
|
2017-04-25 13:05:21 -04:00
|
|
|
// backportMountSpec resolves mount specs (introduced in 1.13) from pre-1.13
|
|
|
|
// mount configurations
|
|
|
|
// The container lock should not be held when calling this function.
|
|
|
|
// Changes are only made in-memory and may make changes to containers referenced
|
|
|
|
// by `container.HostConfig.VolumesFrom`
|
|
|
|
func (daemon *Daemon) backportMountSpec(container *container.Container) {
|
|
|
|
container.Lock()
|
|
|
|
defer container.Unlock()
|
|
|
|
|
2017-08-08 15:43:48 -04:00
|
|
|
parser := volume.NewParser(container.OS)
|
2017-08-01 13:32:44 -04:00
|
|
|
|
2017-04-25 13:05:21 -04:00
|
|
|
maybeUpdate := make(map[string]bool)
|
|
|
|
for _, mp := range container.MountPoints {
|
|
|
|
if mp.Spec.Source != "" && mp.Type != "" {
|
|
|
|
continue
|
2016-08-04 15:34:52 -04:00
|
|
|
}
|
2017-04-25 13:05:21 -04:00
|
|
|
maybeUpdate[mp.Destination] = true
|
|
|
|
}
|
|
|
|
if len(maybeUpdate) == 0 {
|
|
|
|
return
|
|
|
|
}
|
2016-08-04 15:34:52 -04:00
|
|
|
|
2017-04-25 13:05:21 -04:00
|
|
|
mountSpecs := make(map[string]bool, len(container.HostConfig.Mounts))
|
|
|
|
for _, m := range container.HostConfig.Mounts {
|
|
|
|
mountSpecs[m.Target] = true
|
|
|
|
}
|
|
|
|
|
|
|
|
binds := make(map[string]*volume.MountPoint, len(container.HostConfig.Binds))
|
|
|
|
for _, rawSpec := range container.HostConfig.Binds {
|
2017-08-01 13:32:44 -04:00
|
|
|
mp, err := parser.ParseMountRaw(rawSpec, container.HostConfig.VolumeDriver)
|
2017-04-25 13:05:21 -04:00
|
|
|
if err != nil {
|
|
|
|
logrus.WithError(err).Error("Got unexpected error while re-parsing raw volume spec during spec backport")
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
binds[mp.Destination] = mp
|
|
|
|
}
|
|
|
|
|
|
|
|
volumesFrom := make(map[string]volume.MountPoint)
|
|
|
|
for _, fromSpec := range container.HostConfig.VolumesFrom {
|
2017-08-01 13:32:44 -04:00
|
|
|
from, _, err := parser.ParseVolumesFrom(fromSpec)
|
2017-04-25 13:05:21 -04:00
|
|
|
if err != nil {
|
|
|
|
logrus.WithError(err).WithField("id", container.ID).Error("Error reading volumes-from spec during mount spec backport")
|
2017-05-15 15:49:07 -04:00
|
|
|
continue
|
2017-04-25 13:05:21 -04:00
|
|
|
}
|
|
|
|
fromC, err := daemon.GetContainer(from)
|
|
|
|
if err != nil {
|
|
|
|
logrus.WithError(err).WithField("from-container", from).Error("Error looking up volumes-from container")
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// make sure from container's specs have been backported
|
|
|
|
daemon.backportMountSpec(fromC)
|
|
|
|
|
|
|
|
fromC.Lock()
|
|
|
|
for t, mp := range fromC.MountPoints {
|
|
|
|
volumesFrom[t] = *mp
|
|
|
|
}
|
|
|
|
fromC.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
needsUpdate := func(containerMount, other *volume.MountPoint) bool {
|
|
|
|
if containerMount.Type != other.Type || !reflect.DeepEqual(containerMount.Spec, other.Spec) {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
// main
|
|
|
|
for _, cm := range container.MountPoints {
|
|
|
|
if !maybeUpdate[cm.Destination] {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
// nothing to backport if from hostconfig.Mounts
|
|
|
|
if mountSpecs[cm.Destination] {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if mp, exists := binds[cm.Destination]; exists {
|
|
|
|
if needsUpdate(cm, mp) {
|
|
|
|
cm.Spec = mp.Spec
|
|
|
|
cm.Type = mp.Type
|
2016-08-04 15:34:52 -04:00
|
|
|
}
|
2017-04-25 13:05:21 -04:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if cm.Name != "" {
|
|
|
|
if mp, exists := volumesFrom[cm.Destination]; exists {
|
|
|
|
if needsUpdate(cm, &mp) {
|
|
|
|
cm.Spec = mp.Spec
|
|
|
|
cm.Type = mp.Type
|
2016-08-04 15:34:52 -04:00
|
|
|
}
|
2017-04-25 13:05:21 -04:00
|
|
|
continue
|
2016-08-04 15:34:52 -04:00
|
|
|
}
|
2017-04-25 13:05:21 -04:00
|
|
|
|
|
|
|
if cm.Type != "" {
|
|
|
|
// probably specified via the hostconfig.Mounts
|
|
|
|
continue
|
2016-08-04 15:34:52 -04:00
|
|
|
}
|
2017-04-25 13:05:21 -04:00
|
|
|
|
|
|
|
// anon volume
|
|
|
|
cm.Type = mounttypes.TypeVolume
|
|
|
|
cm.Spec.Type = mounttypes.TypeVolume
|
2016-08-04 15:34:52 -04:00
|
|
|
} else {
|
2017-04-25 13:05:21 -04:00
|
|
|
if cm.Type != "" {
|
|
|
|
// already updated
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
cm.Type = mounttypes.TypeBind
|
|
|
|
cm.Spec.Type = mounttypes.TypeBind
|
|
|
|
cm.Spec.Source = cm.Source
|
|
|
|
if cm.Propagation != "" {
|
|
|
|
cm.Spec.BindOptions = &mounttypes.BindOptions{
|
|
|
|
Propagation: cm.Propagation,
|
2016-08-04 15:34:52 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-25 13:05:21 -04:00
|
|
|
cm.Spec.Target = cm.Destination
|
|
|
|
cm.Spec.ReadOnly = !cm.RW
|
2016-08-04 15:34:52 -04:00
|
|
|
}
|
|
|
|
}
|