fc7b904dce
`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>
80 lines
2.9 KiB
Go
80 lines
2.9 KiB
Go
package daemon
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/pkg/stringid"
|
|
"github.com/docker/docker/volume"
|
|
)
|
|
|
|
// createContainerPlatformSpecificSettings performs platform specific container create functionality
|
|
func (daemon *Daemon) createContainerPlatformSpecificSettings(container *container.Container, config *containertypes.Config, hostConfig *containertypes.HostConfig) error {
|
|
// Make sure the host config has the default daemon isolation if not specified by caller.
|
|
if containertypes.Isolation.IsDefault(containertypes.Isolation(hostConfig.Isolation)) {
|
|
hostConfig.Isolation = daemon.defaultIsolation
|
|
}
|
|
|
|
for spec := range config.Volumes {
|
|
|
|
mp, err := volume.ParseMountRaw(spec, hostConfig.VolumeDriver)
|
|
if err != nil {
|
|
return fmt.Errorf("Unrecognised volume spec: %v", err)
|
|
}
|
|
|
|
// If the mountpoint doesn't have a name, generate one.
|
|
if len(mp.Name) == 0 {
|
|
mp.Name = stringid.GenerateNonCryptoID()
|
|
}
|
|
|
|
// Skip volumes for which we already have something mounted on that
|
|
// destination because of a --volume-from.
|
|
if container.IsDestinationMounted(mp.Destination) {
|
|
continue
|
|
}
|
|
|
|
volumeDriver := hostConfig.VolumeDriver
|
|
|
|
// Create the volume in the volume driver. If it doesn't exist,
|
|
// a new one will be created.
|
|
v, err := daemon.volumes.CreateWithRef(mp.Name, volumeDriver, container.ID, nil, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// FIXME Windows: This code block is present in the Linux version and
|
|
// allows the contents to be copied to the container FS prior to it
|
|
// being started. However, the function utilizes the FollowSymLinkInScope
|
|
// path which does not cope with Windows volume-style file paths. There
|
|
// is a separate effort to resolve this (@swernli), so this processing
|
|
// is deferred for now. A case where this would be useful is when
|
|
// a dockerfile includes a VOLUME statement, but something is created
|
|
// in that directory during the dockerfile processing. What this means
|
|
// on Windows for TP5 is that in that scenario, the contents will not
|
|
// copied, but that's (somewhat) OK as HCS will bomb out soon after
|
|
// at it doesn't support mapped directories which have contents in the
|
|
// destination path anyway.
|
|
//
|
|
// Example for repro later:
|
|
// FROM windowsservercore
|
|
// RUN mkdir c:\myvol
|
|
// RUN copy c:\windows\system32\ntdll.dll c:\myvol
|
|
// VOLUME "c:\myvol"
|
|
//
|
|
// Then
|
|
// docker build -t vol .
|
|
// docker run -it --rm vol cmd <-- This is where HCS will error out.
|
|
//
|
|
// // never attempt to copy existing content in a container FS to a shared volume
|
|
// if v.DriverName() == volume.DefaultDriverName {
|
|
// if err := container.CopyImagePathContent(v, mp.Destination); err != nil {
|
|
// return err
|
|
// }
|
|
// }
|
|
|
|
// Add it to container.MountPoints
|
|
container.AddMountPointWithVolume(mp.Destination, v, mp.RW)
|
|
}
|
|
return nil
|
|
}
|