2015-07-16 17:14:58 -04:00
|
|
|
package daemon
|
|
|
|
|
2015-11-12 14:55:17 -05:00
|
|
|
import (
|
2016-09-06 14:18:12 -04:00
|
|
|
"github.com/docker/docker/api/types"
|
2016-02-10 15:16:59 -05:00
|
|
|
"github.com/docker/docker/api/types/backend"
|
2015-11-12 14:55:17 -05:00
|
|
|
"github.com/docker/docker/container"
|
2016-02-10 15:16:59 -05:00
|
|
|
"github.com/docker/docker/daemon/exec"
|
2015-11-12 14:55:17 -05:00
|
|
|
)
|
2015-07-16 17:14:58 -04:00
|
|
|
|
|
|
|
// This sets platform-specific fields
|
2015-11-12 14:55:17 -05:00
|
|
|
func setPlatformSpecificContainerFields(container *container.Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {
|
2015-07-16 17:14:58 -04:00
|
|
|
return contJSONBase
|
|
|
|
}
|
|
|
|
|
2015-11-12 14:55:17 -05:00
|
|
|
func addMountPoints(container *container.Container) []types.MountPoint {
|
2015-09-09 22:23:06 -04:00
|
|
|
mountPoints := make([]types.MountPoint, 0, len(container.MountPoints))
|
|
|
|
for _, m := range container.MountPoints {
|
|
|
|
mountPoints = append(mountPoints, types.MountPoint{
|
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
|
|
|
Type: m.Type,
|
2015-09-09 22:23:06 -04:00
|
|
|
Name: m.Name,
|
|
|
|
Source: m.Path(),
|
|
|
|
Destination: m.Destination,
|
|
|
|
Driver: m.Driver,
|
|
|
|
RW: m.RW,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
return mountPoints
|
2015-07-16 17:14:58 -04:00
|
|
|
}
|
2015-08-24 13:57:39 -04:00
|
|
|
|
2015-11-24 12:55:45 -05:00
|
|
|
// containerInspectPre120 get containers for pre 1.20 APIs.
|
|
|
|
func (daemon *Daemon) containerInspectPre120(name string) (*types.ContainerJSON, error) {
|
2016-06-13 22:52:49 -04:00
|
|
|
return daemon.ContainerInspectCurrent(name, false)
|
2015-08-24 13:57:39 -04:00
|
|
|
}
|
2016-02-10 15:16:59 -05:00
|
|
|
|
|
|
|
func inspectExecProcessConfig(e *exec.Config) *backend.ExecProcessConfig {
|
|
|
|
return &backend.ExecProcessConfig{
|
2016-03-18 14:53:27 -04:00
|
|
|
Tty: e.Tty,
|
|
|
|
Entrypoint: e.Entrypoint,
|
|
|
|
Arguments: e.Args,
|
2016-02-10 15:16:59 -05:00
|
|
|
}
|
|
|
|
}
|