2014-04-17 17:43:01 -04:00
|
|
|
package daemon
|
2014-02-14 20:15:40 -05:00
|
|
|
|
|
|
|
import (
|
2015-05-12 21:21:26 -04:00
|
|
|
"errors"
|
Remove static errors from errors package.
Moving all strings to the errors package wasn't a good idea after all.
Our custom implementation of Go errors predates everything that's nice
and good about working with errors in Go. Take as an example what we
have to do to get an error message:
```go
func GetErrorMessage(err error) string {
switch err.(type) {
case errcode.Error:
e, _ := err.(errcode.Error)
return e.Message
case errcode.ErrorCode:
ec, _ := err.(errcode.ErrorCode)
return ec.Message()
default:
return err.Error()
}
}
```
This goes against every good practice for Go development. The language already provides a simple, intuitive and standard way to get error messages, that is calling the `Error()` method from an error. Reinventing the error interface is a mistake.
Our custom implementation also makes very hard to reason about errors, another nice thing about Go. I found several (>10) error declarations that we don't use anywhere. This is a clear sign about how little we know about the errors we return. I also found several error usages where the number of arguments was different than the parameters declared in the error, another clear example of how difficult is to reason about errors.
Moreover, our custom implementation didn't really make easier for people to return custom HTTP status code depending on the errors. Again, it's hard to reason about when to set custom codes and how. Take an example what we have to do to extract the message and status code from an error before returning a response from the API:
```go
switch err.(type) {
case errcode.ErrorCode:
daError, _ := err.(errcode.ErrorCode)
statusCode = daError.Descriptor().HTTPStatusCode
errMsg = daError.Message()
case errcode.Error:
// For reference, if you're looking for a particular error
// then you can do something like :
// import ( derr "github.com/docker/docker/errors" )
// if daError.ErrorCode() == derr.ErrorCodeNoSuchContainer { ... }
daError, _ := err.(errcode.Error)
statusCode = daError.ErrorCode().Descriptor().HTTPStatusCode
errMsg = daError.Message
default:
// This part of will be removed once we've
// converted everything over to use the errcode package
// FIXME: this is brittle and should not be necessary.
// If we need to differentiate between different possible error types,
// we should create appropriate error types with clearly defined meaning
errStr := strings.ToLower(err.Error())
for keyword, status := range map[string]int{
"not found": http.StatusNotFound,
"no such": http.StatusNotFound,
"bad parameter": http.StatusBadRequest,
"conflict": http.StatusConflict,
"impossible": http.StatusNotAcceptable,
"wrong login/password": http.StatusUnauthorized,
"hasn't been activated": http.StatusForbidden,
} {
if strings.Contains(errStr, keyword) {
statusCode = status
break
}
}
}
```
You can notice two things in that code:
1. We have to explain how errors work, because our implementation goes against how easy to use Go errors are.
2. At no moment we arrived to remove that `switch` statement that was the original reason to use our custom implementation.
This change removes all our status errors from the errors package and puts them back in their specific contexts.
IT puts the messages back with their contexts. That way, we know right away when errors used and how to generate their messages.
It uses custom interfaces to reason about errors. Errors that need to response with a custom status code MUST implementent this simple interface:
```go
type errorWithStatus interface {
HTTPErrorStatusCode() int
}
```
This interface is very straightforward to implement. It also preserves Go errors real behavior, getting the message is as simple as using the `Error()` method.
I included helper functions to generate errors that use custom status code in `errors/errors.go`.
By doing this, we remove the hard dependency we have eeverywhere to our custom errors package. Yes, you can use it as a helper to generate error, but it's still very easy to generate errors without it.
Please, read this fantastic blog post about errors in Go: http://dave.cheney.net/2014/12/24/inspecting-errors
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-25 10:53:35 -05:00
|
|
|
"fmt"
|
2014-02-14 20:15:40 -05:00
|
|
|
"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-08-23 19:24:15 -04:00
|
|
|
"github.com/Sirupsen/logrus"
|
2016-09-15 13:15:57 -04:00
|
|
|
dockererrors "github.com/docker/docker/api/errors"
|
2016-09-06 14:18:12 -04:00
|
|
|
"github.com/docker/docker/api/types"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
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"
|
2015-05-19 16:05:25 -04:00
|
|
|
"github.com/docker/docker/volume"
|
2016-08-23 19:24:15 -04:00
|
|
|
"github.com/docker/docker/volume/drivers"
|
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{}
|
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 {
|
|
|
|
containerID, mode, err := volume.ParseVolumesFrom(v)
|
|
|
|
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,
|
|
|
|
RW: m.RW && volume.ReadWrite(mode),
|
|
|
|
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 {
|
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
|
|
|
bind, err := volume.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
|
|
|
}
|
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 {
|
Remove static errors from errors package.
Moving all strings to the errors package wasn't a good idea after all.
Our custom implementation of Go errors predates everything that's nice
and good about working with errors in Go. Take as an example what we
have to do to get an error message:
```go
func GetErrorMessage(err error) string {
switch err.(type) {
case errcode.Error:
e, _ := err.(errcode.Error)
return e.Message
case errcode.ErrorCode:
ec, _ := err.(errcode.ErrorCode)
return ec.Message()
default:
return err.Error()
}
}
```
This goes against every good practice for Go development. The language already provides a simple, intuitive and standard way to get error messages, that is calling the `Error()` method from an error. Reinventing the error interface is a mistake.
Our custom implementation also makes very hard to reason about errors, another nice thing about Go. I found several (>10) error declarations that we don't use anywhere. This is a clear sign about how little we know about the errors we return. I also found several error usages where the number of arguments was different than the parameters declared in the error, another clear example of how difficult is to reason about errors.
Moreover, our custom implementation didn't really make easier for people to return custom HTTP status code depending on the errors. Again, it's hard to reason about when to set custom codes and how. Take an example what we have to do to extract the message and status code from an error before returning a response from the API:
```go
switch err.(type) {
case errcode.ErrorCode:
daError, _ := err.(errcode.ErrorCode)
statusCode = daError.Descriptor().HTTPStatusCode
errMsg = daError.Message()
case errcode.Error:
// For reference, if you're looking for a particular error
// then you can do something like :
// import ( derr "github.com/docker/docker/errors" )
// if daError.ErrorCode() == derr.ErrorCodeNoSuchContainer { ... }
daError, _ := err.(errcode.Error)
statusCode = daError.ErrorCode().Descriptor().HTTPStatusCode
errMsg = daError.Message
default:
// This part of will be removed once we've
// converted everything over to use the errcode package
// FIXME: this is brittle and should not be necessary.
// If we need to differentiate between different possible error types,
// we should create appropriate error types with clearly defined meaning
errStr := strings.ToLower(err.Error())
for keyword, status := range map[string]int{
"not found": http.StatusNotFound,
"no such": http.StatusNotFound,
"bad parameter": http.StatusBadRequest,
"conflict": http.StatusConflict,
"impossible": http.StatusNotAcceptable,
"wrong login/password": http.StatusUnauthorized,
"hasn't been activated": http.StatusForbidden,
} {
if strings.Contains(errStr, keyword) {
statusCode = status
break
}
}
}
```
You can notice two things in that code:
1. We have to explain how errors work, because our implementation goes against how easy to use Go errors are.
2. At no moment we arrived to remove that `switch` statement that was the original reason to use our custom implementation.
This change removes all our status errors from the errors package and puts them back in their specific contexts.
IT puts the messages back with their contexts. That way, we know right away when errors used and how to generate their messages.
It uses custom interfaces to reason about errors. Errors that need to response with a custom status code MUST implementent this simple interface:
```go
type errorWithStatus interface {
HTTPErrorStatusCode() int
}
```
This interface is very straightforward to implement. It also preserves Go errors real behavior, getting the message is as simple as using the `Error()` method.
I included helper functions to generate errors that use custom status code in `errors/errors.go`.
By doing this, we remove the hard dependency we have eeverywhere to our custom errors package. Yes, you can use it as a helper to generate error, but it's still very easy to generate errors without it.
Please, read this fantastic blog post about errors in Go: http://dave.cheney.net/2014/12/24/inspecting-errors
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-25 10:53:35 -05:00
|
|
|
return fmt.Errorf("Duplicate mount point '%s'", 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 {
|
|
|
|
mp, err := volume.ParseMountSpec(cfg)
|
|
|
|
if err != nil {
|
|
|
|
return dockererrors.NewBadRequestError(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if binds[mp.Destination] {
|
|
|
|
return fmt.Errorf("Duplicate mount point '%s'", cfg.Target)
|
|
|
|
}
|
|
|
|
|
|
|
|
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()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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 {
|
|
|
|
if m.BackwardsCompatible() {
|
|
|
|
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()
|
|
|
|
|
|
|
|
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 {
|
|
|
|
mp, err := volume.ParseMountRaw(rawSpec, container.HostConfig.VolumeDriver)
|
|
|
|
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 {
|
|
|
|
from, _, err := volume.ParseVolumesFrom(fromSpec)
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
2016-08-23 19:24:15 -04:00
|
|
|
|
|
|
|
func (daemon *Daemon) traverseLocalVolumes(fn func(volume.Volume) error) error {
|
|
|
|
localVolumeDriver, err := volumedrivers.GetDriver(volume.DefaultDriverName)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("can't retrieve local volume driver: %v", err)
|
|
|
|
}
|
|
|
|
vols, err := localVolumeDriver.List()
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("can't retrieve local volumes: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, v := range vols {
|
|
|
|
name := v.Name()
|
2017-02-04 12:10:05 -05:00
|
|
|
vol, err := daemon.volumes.Get(name)
|
2016-08-23 19:24:15 -04:00
|
|
|
if err != nil {
|
|
|
|
logrus.Warnf("failed to retrieve volume %s from store: %v", name, err)
|
2017-02-04 12:10:05 -05:00
|
|
|
} else {
|
|
|
|
// daemon.volumes.Get will return DetailedVolume
|
|
|
|
v = vol
|
2016-08-23 19:24:15 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
err = fn(v)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|