-
-
-
- | Internet Relay Chat (IRC) |
-
-
- IRC is a direct line to our most knowledgeable Docker users; we have
- both the #docker and #docker-dev group on
- irc.freenode.net.
- IRC is a rich chat protocol but it can overwhelm new users. You can search
- our chat archives.
-
- Read our IRC quickstart guide for an easy way to get started.
- |
-
-
- | Docker Community Forums |
-
- The Docker Engine
- group is for users of the Docker Engine project.
- |
-
-
- | Google Groups |
-
- The docker-dev group is for contributors and other people
- contributing to the Docker project. You can join this group without a
- Google account by sending an email to docker-dev+subscribe@googlegroups.com.
- You'll receive a join-request message; simply reply to the message to
- confirm your subscription.
- |
-
-
- | Twitter |
-
- You can follow Docker's Twitter feed
- to get updates on our products. You can also tweet us questions or just
- share blogs or stories.
- |
-
-
- | Stack Overflow |
-
- Stack Overflow has over 7000 Docker questions listed. We regularly
- monitor Docker questions
- and so do many other knowledgeable Docker users.
- |
-
-
-
-### Legal
+Legal
+=====
*Brought to you courtesy of our legal counsel. For more context,
-please see the [NOTICE](https://github.com/docker/docker/blob/master/NOTICE) document in this repo.*
+please see the [NOTICE](https://github.com/moby/moby/blob/master/NOTICE) document in this repo.*
-Use and transfer of Docker may be subject to certain restrictions by the
+Use and transfer of Moby may be subject to certain restrictions by the
United States and other governments.
It is your responsibility to ensure that your use and/or transfer does not
@@ -275,30 +85,6 @@ For more information, please see https://www.bis.doc.gov
Licensing
=========
-Docker is licensed under the Apache License, Version 2.0. See
-[LICENSE](https://github.com/docker/docker/blob/master/LICENSE) for the full
+Moby is licensed under the Apache License, Version 2.0. See
+[LICENSE](https://github.com/moby/moby/blob/master/LICENSE) for the full
license text.
-
-Other Docker Related Projects
-=============================
-There are a number of projects under development that are based on Docker's
-core technology. These projects expand the tooling built around the
-Docker platform to broaden its application and utility.
-
-* [Docker Registry](https://github.com/docker/distribution): Registry
-server for Docker (hosting/delivery of repositories and images)
-* [Docker Machine](https://github.com/docker/machine): Machine management
-for a container-centric world
-* [Docker Swarm](https://github.com/docker/swarm): A Docker-native clustering
-system
-* [Docker Compose](https://github.com/docker/compose) (formerly Fig):
-Define and run multi-container apps
-* [Kitematic](https://github.com/docker/kitematic): The easiest way to use
-Docker on Mac and Windows
-
-If you know of another project underway that should be listed here, please help
-us keep this list up-to-date by submitting a PR.
-
-Awesome-Docker
-==============
-You can find more projects, tools and articles related to Docker on the [awesome-docker list](https://github.com/veggiemonk/awesome-docker). Add your project there.
diff --git a/libnetwork/vendor/github.com/docker/docker/api/README.md b/libnetwork/vendor/github.com/docker/docker/api/README.md
index 8954ed0174..bb88132524 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/README.md
+++ b/libnetwork/vendor/github.com/docker/docker/api/README.md
@@ -14,8 +14,8 @@ It consists of various components in this repository:
The API is defined by the [Swagger](http://swagger.io/specification/) definition in `api/swagger.yaml`. This definition can be used to:
-1. To automatically generate documentation.
-2. To automatically generate the Go server and client. (A work-in-progress.)
+1. Automatically generate documentation.
+2. Automatically generate the Go server and client. (A work-in-progress.)
3. Provide a machine readable version of the API for introspecting what it can do, automatically generating clients for other languages, etc.
## Updating the API documentation
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/client.go b/libnetwork/vendor/github.com/docker/docker/api/types/client.go
index 7900d64f0d..0ce2c94303 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/client.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/client.go
@@ -4,7 +4,6 @@ import (
"bufio"
"io"
"net"
- "os"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
@@ -98,6 +97,7 @@ type ContainerStartOptions struct {
// about files to copy into a container
type CopyToContainerOptions struct {
AllowOverwriteDirWithFile bool
+ CopyUIDGID bool
}
// EventsOptions holds parameters to filter events with.
@@ -160,9 +160,10 @@ type ImageBuildOptions struct {
ShmSize int64
Dockerfile string
Ulimits []*units.Ulimit
- // See the parsing of buildArgs in api/server/router/build/build_routes.go
- // for an explaination of why BuildArgs needs to use *string instead of
- // just a string
+ // BuildArgs needs to be a *string instead of just a string so that
+ // we can tell the difference between "" (empty string) and no value
+ // at all (nil). See the parsing of buildArgs in
+ // api/server/router/build/build_routes.go for even more info.
BuildArgs map[string]*string
AuthConfigs map[string]AuthConfig
Context io.Reader
@@ -175,6 +176,8 @@ type ImageBuildOptions struct {
// specified here do not need to have a valid parent chain to match cache.
CacheFrom []string
SecurityOpt []string
+ ExtraHosts []string // List of extra hosts
+ Target string
}
// ImageBuildResponse holds information
@@ -192,8 +195,8 @@ type ImageCreateOptions struct {
// ImageImportSource holds source information for ImageImport
type ImageImportSource struct {
- Source io.Reader // Source is the data to send to the server to create this image from (mutually exclusive with SourceName)
- SourceName string // SourceName is the name of the image to pull (mutually exclusive with Source)
+ Source io.Reader // Source is the data to send to the server to create this image from. You must set SourceName to "-" to leverage this.
+ SourceName string // SourceName is the name of the image to pull. Set to "-" to leverage the Source attribute.
}
// ImageImportOptions holds information to import images from the client host.
@@ -256,18 +259,6 @@ type ResizeOptions struct {
Width uint
}
-// VersionResponse holds version information for the client and the server
-type VersionResponse struct {
- Client *Version
- Server *Version
-}
-
-// ServerOK returns true when the client could connect to the docker server
-// and parse the information received. It returns false otherwise.
-func (v VersionResponse) ServerOK() bool {
- return v.Server != nil
-}
-
// NodeListOptions holds parameters to list nodes with.
type NodeListOptions struct {
Filters filters.Args
@@ -285,6 +276,12 @@ type ServiceCreateOptions struct {
//
// This field follows the format of the X-Registry-Auth header.
EncodedRegistryAuth string
+
+ // QueryRegistry indicates whether the service update requires
+ // contacting a registry. A registry may be contacted to retrieve
+ // the image digest and manifest, which in turn can be used to update
+ // platform or other information about the service.
+ QueryRegistry bool
}
// ServiceCreateResponse contains the information returned to a client
@@ -318,14 +315,32 @@ type ServiceUpdateOptions struct {
// credentials if they are not given in EncodedRegistryAuth. Valid
// values are "spec" and "previous-spec".
RegistryAuthFrom string
+
+ // Rollback indicates whether a server-side rollback should be
+ // performed. When this is set, the provided spec will be ignored.
+ // The valid values are "previous" and "none". An empty value is the
+ // same as "none".
+ Rollback string
+
+ // QueryRegistry indicates whether the service update requires
+ // contacting a registry. A registry may be contacted to retrieve
+ // the image digest and manifest, which in turn can be used to update
+ // platform or other information about the service.
+ QueryRegistry bool
}
-// ServiceListOptions holds parameters to list services with.
+// ServiceListOptions holds parameters to list services with.
type ServiceListOptions struct {
Filters filters.Args
}
-// TaskListOptions holds parameters to list tasks with.
+// ServiceInspectOptions holds parameters related to the "service inspect"
+// operation.
+type ServiceInspectOptions struct {
+ InsertDefaults bool
+}
+
+// TaskListOptions holds parameters to list tasks with.
type TaskListOptions struct {
Filters filters.Args
}
@@ -356,15 +371,6 @@ type PluginInstallOptions struct {
Args []string
}
-// SecretRequestOption is a type for requesting secrets
-type SecretRequestOption struct {
- Source string
- Target string
- UID string
- GID string
- Mode os.FileMode
-}
-
// SwarmUnlockKeyResponse contains the response for Engine API:
// GET /swarm/unlockkey
type SwarmUnlockKeyResponse struct {
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/container/config.go b/libnetwork/vendor/github.com/docker/docker/api/types/container/config.go
index fc050e5dba..55a03fc981 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/container/config.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/container/config.go
@@ -7,6 +7,12 @@ import (
"github.com/docker/go-connections/nat"
)
+// MinimumDuration puts a minimum on user configured duration.
+// This is to prevent API error on time unit. For example, API may
+// set 3 as healthcheck interval with intention of 3 seconds, but
+// Docker interprets it as 3 nanoseconds.
+const MinimumDuration = 1 * time.Millisecond
+
// HealthConfig holds configuration settings for the HEALTHCHECK feature.
type HealthConfig struct {
// Test is the test to perform to check that the container is healthy.
@@ -19,8 +25,9 @@ type HealthConfig struct {
Test []string `json:",omitempty"`
// Zero means to inherit. Durations are expressed as integer nanoseconds.
- Interval time.Duration `json:",omitempty"` // Interval is the time to wait between checks.
- Timeout time.Duration `json:",omitempty"` // Timeout is the time to wait before considering the check to have hung.
+ Interval time.Duration `json:",omitempty"` // Interval is the time to wait between checks.
+ Timeout time.Duration `json:",omitempty"` // Timeout is the time to wait before considering the check to have hung.
+ StartPeriod time.Duration `json:",omitempty"` // The start period for the container to initialize before the retries starts to count down.
// Retries is the number of consecutive failures needed to consider a container as unhealthy.
// Zero means inherit.
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/container/container_changes.go b/libnetwork/vendor/github.com/docker/docker/api/types/container/container_changes.go
new file mode 100644
index 0000000000..767945a532
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/container/container_changes.go
@@ -0,0 +1,21 @@
+package container
+
+// ----------------------------------------------------------------------------
+// DO NOT EDIT THIS FILE
+// This file was generated by `swagger generate operation`
+//
+// See hack/generate-swagger-api.sh
+// ----------------------------------------------------------------------------
+
+// ContainerChangeResponseItem container change response item
+// swagger:model ContainerChangeResponseItem
+type ContainerChangeResponseItem struct {
+
+ // Kind of change
+ // Required: true
+ Kind uint8 `json:"Kind"`
+
+ // Path to file that has changed
+ // Required: true
+ Path string `json:"Path"`
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/container/container_top.go b/libnetwork/vendor/github.com/docker/docker/api/types/container/container_top.go
new file mode 100644
index 0000000000..78bc37ee5e
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/container/container_top.go
@@ -0,0 +1,21 @@
+package container
+
+// ----------------------------------------------------------------------------
+// DO NOT EDIT THIS FILE
+// This file was generated by `swagger generate operation`
+//
+// See hack/generate-swagger-api.sh
+// ----------------------------------------------------------------------------
+
+// ContainerTopOKBody container top o k body
+// swagger:model ContainerTopOKBody
+type ContainerTopOKBody struct {
+
+ // Each process running in the container, where each is process is an array of values corresponding to the titles
+ // Required: true
+ Processes [][]string `json:"Processes"`
+
+ // The ps column titles
+ // Required: true
+ Titles []string `json:"Titles"`
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/container/host_config.go b/libnetwork/vendor/github.com/docker/docker/api/types/container/host_config.go
index d34fa1405c..9fea9eb04b 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/container/host_config.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/container/host_config.go
@@ -10,9 +10,6 @@ import (
"github.com/docker/go-units"
)
-// NetworkMode represents the container network stack.
-type NetworkMode string
-
// Isolation represents the isolation technology of a container. The supported
// values are platform specific
type Isolation string
@@ -66,6 +63,47 @@ func (n IpcMode) Container() string {
return ""
}
+// NetworkMode represents the container network stack.
+type NetworkMode string
+
+// IsNone indicates whether container isn't using a network stack.
+func (n NetworkMode) IsNone() bool {
+ return n == "none"
+}
+
+// IsDefault indicates whether container uses the default network stack.
+func (n NetworkMode) IsDefault() bool {
+ return n == "default"
+}
+
+// IsPrivate indicates whether container uses its private network stack.
+func (n NetworkMode) IsPrivate() bool {
+ return !(n.IsHost() || n.IsContainer())
+}
+
+// IsContainer indicates whether container uses a container network stack.
+func (n NetworkMode) IsContainer() bool {
+ parts := strings.SplitN(string(n), ":", 2)
+ return len(parts) > 1 && parts[0] == "container"
+}
+
+// ConnectedContainer is the id of the container which network this container is connected to.
+func (n NetworkMode) ConnectedContainer() string {
+ parts := strings.SplitN(string(n), ":", 2)
+ if len(parts) > 1 {
+ return parts[1]
+ }
+ return ""
+}
+
+//UserDefined indicates user-created network
+func (n NetworkMode) UserDefined() string {
+ if n.IsUserDefined() {
+ return string(n)
+ }
+ return ""
+}
+
// UsernsMode represents userns mode in the container.
type UsernsMode string
@@ -223,6 +261,17 @@ func (rp *RestartPolicy) IsSame(tp *RestartPolicy) bool {
return rp.Name == tp.Name && rp.MaximumRetryCount == tp.MaximumRetryCount
}
+// LogMode is a type to define the available modes for logging
+// These modes affect how logs are handled when log messages start piling up.
+type LogMode string
+
+// Available logging modes
+const (
+ LogModeUnset = ""
+ LogModeBlocking LogMode = "blocking"
+ LogModeNonBlock LogMode = "non-blocking"
+)
+
// LogConfig represents the logging configuration of the container.
type LogConfig struct {
Type string
@@ -251,6 +300,7 @@ type Resources struct {
CpusetCpus string // CpusetCpus 0-2, 0,1
CpusetMems string // CpusetMems 0-2, 0,1
Devices []DeviceMapping // List of devices to map inside the container
+ DeviceCgroupRules []string // List of rule to be added to the device cgroup
DiskQuota int64 // Disk limit (in bytes)
KernelMemory int64 // Kernel memory limit (in bytes)
MemoryReservation int64 // Memory soft limit (in bytes)
@@ -327,7 +377,4 @@ type HostConfig struct {
// Run a custom init inside the container, if null, use the daemon's configured settings
Init *bool `json:",omitempty"`
-
- // Custom init path
- InitPath string `json:",omitempty"`
}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go b/libnetwork/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
index 9fb79bed6f..2d664d1c96 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
@@ -2,23 +2,11 @@
package container
-import "strings"
-
// IsValid indicates if an isolation technology is valid
func (i Isolation) IsValid() bool {
return i.IsDefault()
}
-// IsPrivate indicates whether container uses its private network stack.
-func (n NetworkMode) IsPrivate() bool {
- return !(n.IsHost() || n.IsContainer())
-}
-
-// IsDefault indicates whether container uses the default network stack.
-func (n NetworkMode) IsDefault() bool {
- return n == "default"
-}
-
// NetworkName returns the name of the network stack.
func (n NetworkMode) NetworkName() string {
if n.IsBridge() {
@@ -47,35 +35,7 @@ func (n NetworkMode) IsHost() bool {
return n == "host"
}
-// IsContainer indicates whether container uses a container network stack.
-func (n NetworkMode) IsContainer() bool {
- parts := strings.SplitN(string(n), ":", 2)
- return len(parts) > 1 && parts[0] == "container"
-}
-
-// IsNone indicates whether container isn't using a network stack.
-func (n NetworkMode) IsNone() bool {
- return n == "none"
-}
-
-// ConnectedContainer is the id of the container which network this container is connected to.
-func (n NetworkMode) ConnectedContainer() string {
- parts := strings.SplitN(string(n), ":", 2)
- if len(parts) > 1 {
- return parts[1]
- }
- return ""
-}
-
// IsUserDefined indicates user-created network
func (n NetworkMode) IsUserDefined() bool {
return !n.IsDefault() && !n.IsBridge() && !n.IsHost() && !n.IsNone() && !n.IsContainer()
}
-
-//UserDefined indicates user-created network
-func (n NetworkMode) UserDefined() string {
- if n.IsUserDefined() {
- return string(n)
- }
- return ""
-}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go b/libnetwork/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
index 0ee332ba68..469923f7e9 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
@@ -4,22 +4,6 @@ import (
"strings"
)
-// IsDefault indicates whether container uses the default network stack.
-func (n NetworkMode) IsDefault() bool {
- return n == "default"
-}
-
-// IsNone indicates whether container isn't using a network stack.
-func (n NetworkMode) IsNone() bool {
- return n == "none"
-}
-
-// IsContainer indicates whether container uses a container network stack.
-// Returns false as windows doesn't support this mode
-func (n NetworkMode) IsContainer() bool {
- return false
-}
-
// IsBridge indicates whether container uses the bridge network stack
// in windows it is given the name NAT
func (n NetworkMode) IsBridge() bool {
@@ -32,20 +16,9 @@ func (n NetworkMode) IsHost() bool {
return false
}
-// IsPrivate indicates whether container uses its private network stack.
-func (n NetworkMode) IsPrivate() bool {
- return !(n.IsHost() || n.IsContainer())
-}
-
-// ConnectedContainer is the id of the container which network this container is connected to.
-// Returns blank string on windows
-func (n NetworkMode) ConnectedContainer() string {
- return ""
-}
-
// IsUserDefined indicates user-created network
func (n NetworkMode) IsUserDefined() bool {
- return !n.IsDefault() && !n.IsNone() && !n.IsBridge()
+ return !n.IsDefault() && !n.IsNone() && !n.IsBridge() && !n.IsContainer()
}
// IsHyperV indicates the use of a Hyper-V partition for isolation
@@ -71,17 +44,11 @@ func (n NetworkMode) NetworkName() string {
return "nat"
} else if n.IsNone() {
return "none"
+ } else if n.IsContainer() {
+ return "container"
} else if n.IsUserDefined() {
return n.UserDefined()
}
return ""
}
-
-//UserDefined indicates user-created network
-func (n NetworkMode) UserDefined() string {
- if n.IsUserDefined() {
- return string(n)
- }
- return ""
-}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/container/waitcondition.go b/libnetwork/vendor/github.com/docker/docker/api/types/container/waitcondition.go
new file mode 100644
index 0000000000..64820fe358
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/container/waitcondition.go
@@ -0,0 +1,22 @@
+package container
+
+// WaitCondition is a type used to specify a container state for which
+// to wait.
+type WaitCondition string
+
+// Possible WaitCondition Values.
+//
+// WaitConditionNotRunning (default) is used to wait for any of the non-running
+// states: "created", "exited", "dead", "removing", or "removed".
+//
+// WaitConditionNextExit is used to wait for the next time the state changes
+// to a non-running state. If the state is currently "created" or "exited",
+// this would cause Wait() to block until either the container runs and exits
+// or is removed.
+//
+// WaitConditionRemoved is used to wait for the container to be removed.
+const (
+ WaitConditionNotRunning WaitCondition = "not-running"
+ WaitConditionNextExit WaitCondition = "next-exit"
+ WaitConditionRemoved WaitCondition = "removed"
+)
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/filters/parse.go b/libnetwork/vendor/github.com/docker/docker/api/types/filters/parse.go
index e01a41deb8..beec3d4940 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/filters/parse.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/filters/parse.go
@@ -79,8 +79,8 @@ func ToParamWithVersion(version string, a Args) (string, error) {
}
// for daemons older than v1.10, filter must be of the form map[string][]string
- buf := []byte{}
- err := errors.New("")
+ var buf []byte
+ var err error
if version != "" && versions.LessThan(version, "1.22") {
buf, err = json.Marshal(convertArgsToSlice(a.fields))
} else {
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/graph_driver_data.go b/libnetwork/vendor/github.com/docker/docker/api/types/graph_driver_data.go
new file mode 100644
index 0000000000..4d9bf1c62c
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/graph_driver_data.go
@@ -0,0 +1,17 @@
+package types
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+// GraphDriverData Information about a container's graph driver.
+// swagger:model GraphDriverData
+type GraphDriverData struct {
+
+ // data
+ // Required: true
+ Data map[string]string `json:"Data"`
+
+ // name
+ // Required: true
+ Name string `json:"Name"`
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/image_delete_response_item.go b/libnetwork/vendor/github.com/docker/docker/api/types/image_delete_response_item.go
new file mode 100644
index 0000000000..b9a65a0d8e
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/image_delete_response_item.go
@@ -0,0 +1,15 @@
+package types
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+// ImageDeleteResponseItem image delete response item
+// swagger:model ImageDeleteResponseItem
+type ImageDeleteResponseItem struct {
+
+ // The image ID of an image that was deleted
+ Deleted string `json:"Deleted,omitempty"`
+
+ // The image ID of an image that was untagged
+ Untagged string `json:"Untagged,omitempty"`
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/mount/mount.go b/libnetwork/vendor/github.com/docker/docker/api/types/mount/mount.go
index 31f2365b8e..2744f85d6d 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/mount/mount.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/mount/mount.go
@@ -23,9 +23,10 @@ type Mount struct {
// Source specifies the name of the mount. Depending on mount type, this
// may be a volume name or a host path, or even ignored.
// Source is not supported for tmpfs (must be an empty value)
- Source string `json:",omitempty"`
- Target string `json:",omitempty"`
- ReadOnly bool `json:",omitempty"`
+ Source string `json:",omitempty"`
+ Target string `json:",omitempty"`
+ ReadOnly bool `json:",omitempty"`
+ Consistency Consistency `json:",omitempty"`
BindOptions *BindOptions `json:",omitempty"`
VolumeOptions *VolumeOptions `json:",omitempty"`
@@ -60,6 +61,20 @@ var Propagations = []Propagation{
PropagationSlave,
}
+// Consistency represents the consistency requirements of a mount.
+type Consistency string
+
+const (
+ // ConsistencyFull guarantees bind-mount-like consistency
+ ConsistencyFull Consistency = "consistent"
+ // ConsistencyCached mounts can cache read data and FS structure
+ ConsistencyCached Consistency = "cached"
+ // ConsistencyDelegated mounts can cache read and written data and structure
+ ConsistencyDelegated Consistency = "delegated"
+ // ConsistencyDefault provides "consistent" behavior unless overridden
+ ConsistencyDefault Consistency = "default"
+)
+
// BindOptions defines options specific to mounts of type "bind".
type BindOptions struct {
Propagation Propagation `json:",omitempty"`
@@ -83,7 +98,7 @@ type TmpfsOptions struct {
// Size sets the size of the tmpfs, in bytes.
//
// This will be converted to an operating system specific value
- // depending on the host. For example, on linux, it will be convered to
+ // depending on the host. For example, on linux, it will be converted to
// use a 'k', 'm' or 'g' syntax. BSD, though not widely supported with
// docker, uses a straight byte value.
//
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/network/network.go b/libnetwork/vendor/github.com/docker/docker/api/types/network/network.go
index 07ea05035b..7c7dbacc85 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/network/network.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/network/network.go
@@ -28,6 +28,14 @@ type EndpointIPAMConfig struct {
LinkLocalIPs []string `json:",omitempty"`
}
+// Copy makes a copy of the endpoint ipam config
+func (cfg *EndpointIPAMConfig) Copy() *EndpointIPAMConfig {
+ cfgCopy := *cfg
+ cfgCopy.LinkLocalIPs = make([]string, 0, len(cfg.LinkLocalIPs))
+ cfgCopy.LinkLocalIPs = append(cfgCopy.LinkLocalIPs, cfg.LinkLocalIPs...)
+ return &cfgCopy
+}
+
// PeerInfo represents one peer of an overlay network
type PeerInfo struct {
Name string
@@ -50,6 +58,42 @@ type EndpointSettings struct {
GlobalIPv6Address string
GlobalIPv6PrefixLen int
MacAddress string
+ DriverOpts map[string]string
+}
+
+// Task carries the information about one backend task
+type Task struct {
+ Name string
+ EndpointID string
+ EndpointIP string
+ Info map[string]string
+}
+
+// ServiceInfo represents service parameters with the list of service's tasks
+type ServiceInfo struct {
+ VIP string
+ Ports []string
+ LocalLBIndex int
+ Tasks []Task
+}
+
+// Copy makes a deep copy of `EndpointSettings`
+func (es *EndpointSettings) Copy() *EndpointSettings {
+ epCopy := *es
+ if es.IPAMConfig != nil {
+ epCopy.IPAMConfig = es.IPAMConfig.Copy()
+ }
+
+ if es.Links != nil {
+ links := make([]string, 0, len(es.Links))
+ epCopy.Links = append(links, es.Links...)
+ }
+
+ if es.Aliases != nil {
+ aliases := make([]string, 0, len(es.Aliases))
+ epCopy.Aliases = append(aliases, es.Aliases...)
+ }
+ return &epCopy
}
// NetworkingConfig represents the container's networking configuration for each of its interfaces
@@ -57,3 +101,8 @@ type EndpointSettings struct {
type NetworkingConfig struct {
EndpointsConfig map[string]*EndpointSettings // Endpoint configs for each connecting network
}
+
+// ConfigReference specifies the source which provides a network's configuration
+type ConfigReference struct {
+ Network string
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/plugin.go b/libnetwork/vendor/github.com/docker/docker/api/types/plugin.go
index 44c7f52721..ed3c2c26e4 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/plugin.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/plugin.go
@@ -22,6 +22,9 @@ type Plugin struct {
// Required: true
Name string `json:"Name"`
+ // plugin remote reference used to push/pull the plugin
+ PluginReference string `json:"PluginReference,omitempty"`
+
// settings
// Required: true
Settings PluginSettings `json:"Settings"`
@@ -39,6 +42,9 @@ type PluginConfig struct {
// Required: true
Description string `json:"Description"`
+ // Docker Version used to create the plugin
+ DockerVersion string `json:"DockerVersion,omitempty"`
+
// documentation
// Required: true
Documentation string `json:"Documentation"`
@@ -55,6 +61,10 @@ type PluginConfig struct {
// Required: true
Interface PluginConfigInterface `json:"Interface"`
+ // ipc host
+ // Required: true
+ IpcHost bool `json:"IpcHost"`
+
// linux
// Required: true
Linux PluginConfigLinux `json:"Linux"`
@@ -67,6 +77,10 @@ type PluginConfig struct {
// Required: true
Network PluginConfigNetwork `json:"Network"`
+ // pid host
+ // Required: true
+ PidHost bool `json:"PidHost"`
+
// propagated mount
// Required: true
PropagatedMount string `json:"PropagatedMount"`
@@ -120,14 +134,14 @@ type PluginConfigInterface struct {
// swagger:model PluginConfigLinux
type PluginConfigLinux struct {
+ // allow all devices
+ // Required: true
+ AllowAllDevices bool `json:"AllowAllDevices"`
+
// capabilities
// Required: true
Capabilities []string `json:"Capabilities"`
- // device creation
- // Required: true
- DeviceCreation bool `json:"DeviceCreation"`
-
// devices
// Required: true
Devices []PluginDevice `json:"Devices"`
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/plugin_responses.go b/libnetwork/vendor/github.com/docker/docker/api/types/plugin_responses.go
index d6f7553119..1c6461f2d9 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/plugin_responses.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/plugin_responses.go
@@ -3,6 +3,7 @@ package types
import (
"encoding/json"
"fmt"
+ "sort"
)
// PluginsListResponse contains the response for the Engine API
@@ -62,3 +63,17 @@ type PluginPrivilege struct {
// PluginPrivileges is a list of PluginPrivilege
type PluginPrivileges []PluginPrivilege
+
+func (s PluginPrivileges) Len() int {
+ return len(s)
+}
+
+func (s PluginPrivileges) Less(i, j int) bool {
+ return s[i].Name < s[j].Name
+}
+
+func (s PluginPrivileges) Swap(i, j int) {
+ sort.Strings(s[i].Value)
+ sort.Strings(s[j].Value)
+ s[i], s[j] = s[j], s[i]
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/registry/registry.go b/libnetwork/vendor/github.com/docker/docker/api/types/registry/registry.go
index 28fafab901..b98a943a13 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/registry/registry.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/registry/registry.go
@@ -3,13 +3,17 @@ package registry
import (
"encoding/json"
"net"
+
+ "github.com/opencontainers/image-spec/specs-go/v1"
)
// ServiceConfig stores daemon registry services configuration.
type ServiceConfig struct {
- InsecureRegistryCIDRs []*NetIPNet `json:"InsecureRegistryCIDRs"`
- IndexConfigs map[string]*IndexInfo `json:"IndexConfigs"`
- Mirrors []string
+ AllowNondistributableArtifactsCIDRs []*NetIPNet
+ AllowNondistributableArtifactsHostnames []string
+ InsecureRegistryCIDRs []*NetIPNet `json:"InsecureRegistryCIDRs"`
+ IndexConfigs map[string]*IndexInfo `json:"IndexConfigs"`
+ Mirrors []string
}
// NetIPNet is the net.IPNet type, which can be marshalled and
@@ -102,3 +106,14 @@ type SearchResults struct {
// Results is a slice containing the actual results for the search
Results []SearchResult `json:"results"`
}
+
+// DistributionInspect describes the result obtained from contacting the
+// registry to retrieve image metadata
+type DistributionInspect struct {
+ // Descriptor contains information about the manifest, including
+ // the content addressable digest
+ Descriptor v1.Descriptor
+ // Platforms contains the list of platforms supported by the image,
+ // obtained by parsing the manifest
+ Platforms []v1.Platform
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/stats.go b/libnetwork/vendor/github.com/docker/docker/api/types/stats.go
index 9bf1928b8c..7ca76a5b63 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/stats.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/stats.go
@@ -47,6 +47,9 @@ type CPUStats struct {
// System Usage. Linux only.
SystemUsage uint64 `json:"system_cpu_usage,omitempty"`
+ // Online CPUs. Linux only.
+ OnlineCPUs uint32 `json:"online_cpus,omitempty"`
+
// Throttling Data. Linux only.
ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`
}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/common.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/common.go
index 64a648bad1..54af82b31b 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/common.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/common.go
@@ -17,7 +17,7 @@ type Meta struct {
// Annotations represents how to describe an object.
type Annotations struct {
Name string `json:",omitempty"`
- Labels map[string]string `json:",omitempty"`
+ Labels map[string]string `json:"Labels"`
}
// Driver represents a driver (network, logging).
@@ -25,3 +25,16 @@ type Driver struct {
Name string `json:",omitempty"`
Options map[string]string `json:",omitempty"`
}
+
+// TLSInfo represents the TLS information about what CA certificate is trusted,
+// and who the issuer for a TLS certificate is
+type TLSInfo struct {
+ // TrustRoot is the trusted CA root certificate in PEM format
+ TrustRoot string `json:",omitempty"`
+
+ // CertIssuer is the raw subject bytes of the issuer
+ CertIssuerSubject []byte `json:",omitempty"`
+
+ // CertIssuerPublicKey is the raw public key bytes of the issuer
+ CertIssuerPublicKey []byte `json:",omitempty"`
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/config.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/config.go
new file mode 100644
index 0000000000..0fb021ce92
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/config.go
@@ -0,0 +1,31 @@
+package swarm
+
+import "os"
+
+// Config represents a config.
+type Config struct {
+ ID string
+ Meta
+ Spec ConfigSpec
+}
+
+// ConfigSpec represents a config specification from a config in swarm
+type ConfigSpec struct {
+ Annotations
+ Data []byte `json:",omitempty"`
+}
+
+// ConfigReferenceFileTarget is a file target in a config reference
+type ConfigReferenceFileTarget struct {
+ Name string
+ UID string
+ GID string
+ Mode os.FileMode
+}
+
+// ConfigReference is a reference to a config in swarm
+type ConfigReference struct {
+ File *ConfigReferenceFileTarget
+ ConfigID string
+ ConfigName string
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/container.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/container.go
index 4ab476ccc3..6f8b45f6bb 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/container.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/container.go
@@ -21,6 +21,28 @@ type DNSConfig struct {
Options []string `json:",omitempty"`
}
+// SELinuxContext contains the SELinux labels of the container.
+type SELinuxContext struct {
+ Disable bool
+
+ User string
+ Role string
+ Type string
+ Level string
+}
+
+// CredentialSpec for managed service account (Windows only)
+type CredentialSpec struct {
+ File string
+ Registry string
+}
+
+// Privileges defines the security options for the container.
+type Privileges struct {
+ CredentialSpec *CredentialSpec
+ SELinuxContext *SELinuxContext
+}
+
// ContainerSpec represents the spec of a container.
type ContainerSpec struct {
Image string `json:",omitempty"`
@@ -32,8 +54,11 @@ type ContainerSpec struct {
Dir string `json:",omitempty"`
User string `json:",omitempty"`
Groups []string `json:",omitempty"`
+ Privileges *Privileges `json:",omitempty"`
+ StopSignal string `json:",omitempty"`
TTY bool `json:",omitempty"`
OpenStdin bool `json:",omitempty"`
+ ReadOnly bool `json:",omitempty"`
Mounts []mount.Mount `json:",omitempty"`
StopGracePeriod *time.Duration `json:",omitempty"`
Healthcheck *container.HealthConfig `json:",omitempty"`
@@ -43,4 +68,5 @@ type ContainerSpec struct {
Hosts []string `json:",omitempty"`
DNSConfig *DNSConfig `json:",omitempty"`
Secrets []*SecretReference `json:",omitempty"`
+ Configs []*ConfigReference `json:",omitempty"`
}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/network.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/network.go
index 5a5e11bdba..97c484e14c 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/network.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/network.go
@@ -1,5 +1,9 @@
package swarm
+import (
+ "github.com/docker/docker/api/types/network"
+)
+
// Endpoint represents an endpoint.
type Endpoint struct {
Spec EndpointSpec `json:",omitempty"`
@@ -78,17 +82,21 @@ type Network struct {
// NetworkSpec represents the spec of a network.
type NetworkSpec struct {
Annotations
- DriverConfiguration *Driver `json:",omitempty"`
- IPv6Enabled bool `json:",omitempty"`
- Internal bool `json:",omitempty"`
- Attachable bool `json:",omitempty"`
- IPAMOptions *IPAMOptions `json:",omitempty"`
+ DriverConfiguration *Driver `json:",omitempty"`
+ IPv6Enabled bool `json:",omitempty"`
+ Internal bool `json:",omitempty"`
+ Attachable bool `json:",omitempty"`
+ Ingress bool `json:",omitempty"`
+ IPAMOptions *IPAMOptions `json:",omitempty"`
+ ConfigFrom *network.ConfigReference `json:",omitempty"`
+ Scope string `json:",omitempty"`
}
// NetworkAttachmentConfig represents the configuration of a network attachment.
type NetworkAttachmentConfig struct {
- Target string `json:",omitempty"`
- Aliases []string `json:",omitempty"`
+ Target string `json:",omitempty"`
+ Aliases []string `json:",omitempty"`
+ DriverOpts map[string]string `json:",omitempty"`
}
// NetworkAttachment represents a network attachment.
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/node.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/node.go
index 379e17a779..28c6851e9c 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/node.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/node.go
@@ -52,6 +52,7 @@ type NodeDescription struct {
Platform Platform `json:",omitempty"`
Resources Resources `json:",omitempty"`
Engine EngineDescription `json:",omitempty"`
+ TLSInfo TLSInfo `json:",omitempty"`
}
// Platform represents the platform (Arch/OS).
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/runtime.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/runtime.go
new file mode 100644
index 0000000000..c4c731dc82
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/runtime.go
@@ -0,0 +1,19 @@
+package swarm
+
+// RuntimeType is the type of runtime used for the TaskSpec
+type RuntimeType string
+
+// RuntimeURL is the proto type url
+type RuntimeURL string
+
+const (
+ // RuntimeContainer is the container based runtime
+ RuntimeContainer RuntimeType = "container"
+ // RuntimePlugin is the plugin based runtime
+ RuntimePlugin RuntimeType = "plugin"
+
+ // RuntimeURLContainer is the proto url for the container type
+ RuntimeURLContainer RuntimeURL = "types.docker.com/RuntimeContainer"
+ // RuntimeURLPlugin is the proto url for the plugin type
+ RuntimeURLPlugin RuntimeURL = "types.docker.com/RuntimePlugin"
+)
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/service.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/service.go
index 04f59de862..fa31a7ec86 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/service.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/service.go
@@ -18,9 +18,10 @@ type ServiceSpec struct {
// TaskTemplate defines how the service should construct new tasks when
// orchestrating this service.
- TaskTemplate TaskSpec `json:",omitempty"`
- Mode ServiceMode `json:",omitempty"`
- UpdateConfig *UpdateConfig `json:",omitempty"`
+ TaskTemplate TaskSpec `json:",omitempty"`
+ Mode ServiceMode `json:",omitempty"`
+ UpdateConfig *UpdateConfig `json:",omitempty"`
+ RollbackConfig *UpdateConfig `json:",omitempty"`
// Networks field in ServiceSpec is deprecated. The
// same field in TaskSpec should be used instead.
@@ -45,6 +46,12 @@ const (
UpdateStatePaused UpdateState = "paused"
// UpdateStateCompleted is the completed state.
UpdateStateCompleted UpdateState = "completed"
+ // UpdateStateRollbackStarted is the state with a rollback in progress.
+ UpdateStateRollbackStarted UpdateState = "rollback_started"
+ // UpdateStateRollbackPaused is the state with a rollback in progress.
+ UpdateStateRollbackPaused UpdateState = "rollback_paused"
+ // UpdateStateRollbackCompleted is the state with a rollback in progress.
+ UpdateStateRollbackCompleted UpdateState = "rollback_completed"
)
// UpdateStatus reports the status of a service update.
@@ -68,6 +75,13 @@ const (
UpdateFailureActionPause = "pause"
// UpdateFailureActionContinue CONTINUE
UpdateFailureActionContinue = "continue"
+ // UpdateFailureActionRollback ROLLBACK
+ UpdateFailureActionRollback = "rollback"
+
+ // UpdateOrderStopFirst STOP_FIRST
+ UpdateOrderStopFirst = "stop-first"
+ // UpdateOrderStartFirst START_FIRST
+ UpdateOrderStartFirst = "start-first"
)
// UpdateConfig represents the update configuration.
@@ -102,4 +116,9 @@ type UpdateConfig struct {
// If the failure action is PAUSE, no more tasks will be updated until
// another update is started.
MaxFailureRatio float32
+
+ // Order indicates the order of operations when rolling out an updated
+ // task. Either the old task is shut down before the new task is
+ // started, or the new task is started before the old task is shut down.
+ Order string
}
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/swarm.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/swarm.go
index 0b42219696..5b74f14b11 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/swarm.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/swarm.go
@@ -7,7 +7,9 @@ import "time"
type ClusterInfo struct {
ID string
Meta
- Spec Spec
+ Spec Spec
+ TLSInfo TLSInfo
+ RootRotationInProgress bool
}
// Swarm represents a swarm.
@@ -107,6 +109,16 @@ type CAConfig struct {
// ExternalCAs is a list of CAs to which a manager node will make
// certificate signing requests for node certificates.
ExternalCAs []*ExternalCA `json:",omitempty"`
+
+ // SigningCACert and SigningCAKey specify the desired signing root CA and
+ // root CA key for the swarm. When inspecting the cluster, the key will
+ // be redacted.
+ SigningCACert string `json:",omitempty"`
+ SigningCAKey string `json:",omitempty"`
+
+ // If this value changes, and there is no specified signing cert and key,
+ // then the swarm is forced to generate a new root certificate ane key.
+ ForceRotate uint64 `json:",omitempty"`
}
// ExternalCAProtocol represents type of external CA.
@@ -126,23 +138,31 @@ type ExternalCA struct {
// Options is a set of additional key/value pairs whose interpretation
// depends on the specified CA type.
Options map[string]string `json:",omitempty"`
+
+ // CACert specifies which root CA is used by this external CA. This certificate must
+ // be in PEM format.
+ CACert string
}
// InitRequest is the request used to init a swarm.
type InitRequest struct {
ListenAddr string
AdvertiseAddr string
+ DataPathAddr string
ForceNewCluster bool
Spec Spec
AutoLockManagers bool
+ Availability NodeAvailability
}
// JoinRequest is the request used to join a swarm.
type JoinRequest struct {
ListenAddr string
AdvertiseAddr string
+ DataPathAddr string
RemoteAddrs []string
JoinToken string // accept by secret
+ Availability NodeAvailability
}
// UnlockRequest is the request used to unlock a swarm.
@@ -177,10 +197,10 @@ type Info struct {
Error string
RemoteManagers []Peer
- Nodes int
- Managers int
+ Nodes int `json:",omitempty"`
+ Managers int `json:",omitempty"`
- Cluster ClusterInfo
+ Cluster *ClusterInfo `json:",omitempty"`
}
// Peer represents a peer.
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/task.go b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/task.go
index ace12cc89f..a598a79d59 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/swarm/task.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/swarm/task.go
@@ -65,6 +65,8 @@ type TaskSpec struct {
// ForceUpdate is a counter that triggers an update even if no relevant
// parameters have been changed.
ForceUpdate uint64
+
+ Runtime RuntimeType `json:",omitempty"`
}
// Resources represents resources (CPU/Memory).
@@ -81,7 +83,26 @@ type ResourceRequirements struct {
// Placement represents orchestration parameters.
type Placement struct {
- Constraints []string `json:",omitempty"`
+ Constraints []string `json:",omitempty"`
+ Preferences []PlacementPreference `json:",omitempty"`
+
+ // Platforms stores all the platforms that the image can run on.
+ // This field is used in the platform filter for scheduling. If empty,
+ // then the platform filter is off, meaning there are no scheduling restrictions.
+ Platforms []Platform `json:",omitempty"`
+}
+
+// PlacementPreference provides a way to make the scheduler aware of factors
+// such as topology.
+type PlacementPreference struct {
+ Spread *SpreadOver
+}
+
+// SpreadOver is a scheduling preference that instructs the scheduler to spread
+// tasks evenly over groups of nodes identified by labels.
+type SpreadOver struct {
+ // label descriptor, such as engine.labels.az
+ SpreadDescriptor string
}
// RestartPolicy represents the restart policy.
diff --git a/libnetwork/vendor/github.com/docker/docker/api/types/types.go b/libnetwork/vendor/github.com/docker/docker/api/types/types.go
index e97df9bc9c..c905466e29 100644
--- a/libnetwork/vendor/github.com/docker/docker/api/types/types.go
+++ b/libnetwork/vendor/github.com/docker/docker/api/types/types.go
@@ -17,38 +17,6 @@ import (
"github.com/docker/go-connections/nat"
)
-// ContainerChange contains response of Engine API:
-// GET "/containers/{name:.*}/changes"
-type ContainerChange struct {
- Kind int
- Path string
-}
-
-// ImageHistory contains response of Engine API:
-// GET "/images/{name:.*}/history"
-type ImageHistory struct {
- ID string `json:"Id"`
- Created int64
- CreatedBy string
- Tags []string
- Size int64
- Comment string
-}
-
-// ImageDelete contains response of Engine API:
-// DELETE "/images/{name:.*}"
-type ImageDelete struct {
- Untagged string `json:",omitempty"`
- Deleted string `json:",omitempty"`
-}
-
-// GraphDriverData returns Image's graph driver config info
-// when calling inspect command
-type GraphDriverData struct {
- Name string
- Data map[string]string
-}
-
// RootFS returns Image's RootFS description including the layer IDs.
type RootFS struct {
Type string
@@ -125,17 +93,11 @@ type ContainerStats struct {
OSType string `json:"ostype"`
}
-// ContainerProcessList contains response of Engine API:
-// GET "/containers/{name:.*}/top"
-type ContainerProcessList struct {
- Processes [][]string
- Titles []string
-}
-
// Ping contains response of Engine API:
// GET "/_ping"
type Ping struct {
APIVersion string
+ OSType string
Experimental bool
}
@@ -276,6 +238,8 @@ type PluginsInfo struct {
Network []string
// List of Authorization plugins registered
Authorization []string
+ // List of Log plugins registered
+ Log []string
}
// ExecStartCheck is a temp struct used by execStart
@@ -313,7 +277,7 @@ type Health struct {
// ContainerState stores container's running state
// it's part of ContainerJSONBase and will return by "inspect" command
type ContainerState struct {
- Status string
+ Status string // String representation of the container state. Can be one of "created", "running", "paused", "restarting", "removing", "exited", or "dead"
Running bool
Paused bool
Restarting bool
@@ -429,19 +393,23 @@ type MountPoint struct {
// NetworkResource is the body of the "get network" http response message
type NetworkResource struct {
- Name string // Name is the requested name of the network
- ID string `json:"Id"` // ID uniquely identifies a network on a single machine
- Created time.Time // Created is the time the network created
- Scope string // Scope describes the level at which the network exists (e.g. `global` for cluster-wide or `local` for machine level)
- Driver string // Driver is the Driver name used to create the network (e.g. `bridge`, `overlay`)
- EnableIPv6 bool // EnableIPv6 represents whether to enable IPv6
- IPAM network.IPAM // IPAM is the network's IP Address Management
- Internal bool // Internal represents if the network is used internal only
- Attachable bool // Attachable represents if the global scope is manually attachable by regular containers from workers in swarm mode.
- Containers map[string]EndpointResource // Containers contains endpoints belonging to the network
- Options map[string]string // Options holds the network specific options to use for when creating the network
- Labels map[string]string // Labels holds metadata specific to the network being created
- Peers []network.PeerInfo `json:",omitempty"` // List of peer nodes for an overlay network
+ Name string // Name is the requested name of the network
+ ID string `json:"Id"` // ID uniquely identifies a network on a single machine
+ Created time.Time // Created is the time the network created
+ Scope string // Scope describes the level at which the network exists (e.g. `swarm` for cluster-wide or `local` for machine level)
+ Driver string // Driver is the Driver name used to create the network (e.g. `bridge`, `overlay`)
+ EnableIPv6 bool // EnableIPv6 represents whether to enable IPv6
+ IPAM network.IPAM // IPAM is the network's IP Address Management
+ Internal bool // Internal represents if the network is used internal only
+ Attachable bool // Attachable represents if the global scope is manually attachable by regular containers from workers in swarm mode.
+ Ingress bool // Ingress indicates the network is providing the routing-mesh for the swarm cluster.
+ ConfigFrom network.ConfigReference // ConfigFrom specifies the source which will provide the configuration for this network.
+ ConfigOnly bool // ConfigOnly networks are place-holder networks for network configurations to be used by other networks. ConfigOnly networks cannot be used directly to run containers or services.
+ Containers map[string]EndpointResource // Containers contains endpoints belonging to the network
+ Options map[string]string // Options holds the network specific options to use for when creating the network
+ Labels map[string]string // Labels holds metadata specific to the network being created
+ Peers []network.PeerInfo `json:",omitempty"` // List of peer nodes for an overlay network
+ Services map[string]network.ServiceInfo `json:",omitempty"`
}
// EndpointResource contains network resources allocated and used for a container in a network
@@ -455,12 +423,23 @@ type EndpointResource struct {
// NetworkCreate is the expected body of the "create network" http request message
type NetworkCreate struct {
+ // Check for networks with duplicate names.
+ // Network is primarily keyed based on a random ID and not on the name.
+ // Network name is strictly a user-friendly alias to the network
+ // which is uniquely identified using ID.
+ // And there is no guaranteed way to check for duplicates.
+ // Option CheckDuplicate is there to provide a best effort checking of any networks
+ // which has the same name but it is not guaranteed to catch all name collisions.
CheckDuplicate bool
Driver string
+ Scope string
EnableIPv6 bool
IPAM *network.IPAM
Internal bool
Attachable bool
+ Ingress bool
+ ConfigOnly bool
+ ConfigFrom *network.ConfigReference
Options map[string]string
Labels map[string]string
}
@@ -526,7 +505,7 @@ type VolumesPruneReport struct {
// ImagesPruneReport contains the response for Engine API:
// POST "/images/prune"
type ImagesPruneReport struct {
- ImagesDeleted []ImageDelete
+ ImagesDeleted []ImageDeleteResponseItem
SpaceReclaimed uint64
}
@@ -548,6 +527,18 @@ type SecretListOptions struct {
Filters filters.Args
}
+// ConfigCreateResponse contains the information returned to a client
+// on the creation of a new config.
+type ConfigCreateResponse struct {
+ // ID is the id of the created config.
+ ID string
+}
+
+// ConfigListOptions holds parameters to list configs
+type ConfigListOptions struct {
+ Filters filters.Args
+}
+
// PushResult contains the tag, manifest digest, and manifest size from the
// push. It's used to signal this information to the trust code in the client
// so it can sign the manifest if necessary.
@@ -556,3 +547,8 @@ type PushResult struct {
Digest string
Size int
}
+
+// BuildResult contains the image id of a successful build
+type BuildResult struct {
+ ID string
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/daemon/cluster/provider/cluster.go b/libnetwork/vendor/github.com/docker/docker/daemon/cluster/provider/cluster.go
new file mode 100644
index 0000000000..8c97f87d3d
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/daemon/cluster/provider/cluster.go
@@ -0,0 +1,36 @@
+package provider
+
+import (
+ "github.com/docker/docker/api/types/network"
+ "golang.org/x/net/context"
+)
+
+const (
+ // ClusterEventSocketChange control socket changed
+ ClusterEventSocketChange = iota
+ // ClusterEventNodeReady cluster node in ready state
+ ClusterEventNodeReady
+ // ClusterEventNodeLeave node is leaving the cluster
+ ClusterEventNodeLeave
+ // ClusterEventNetworkKeysAvailable network keys correctly configured in the networking layer
+ ClusterEventNetworkKeysAvailable
+)
+
+// ClusterConfigEventType type of the event produced by the cluster
+type ClusterConfigEventType uint8
+
+// Cluster provides clustering config details
+type Cluster interface {
+ IsManager() bool
+ IsAgent() bool
+ GetLocalAddress() string
+ GetListenAddress() string
+ GetAdvertiseAddress() string
+ GetDataPathAddress() string
+ GetRemoteAddressList() []string
+ ListenClusterEvents() <-chan ClusterConfigEventType
+ AttachNetwork(string, string, []string) (*network.NetworkingConfig, error)
+ DetachNetwork(string, string) error
+ UpdateAttachment(string, string, *network.NetworkingConfig) error
+ WaitForDetachment(context.Context, string, string, string, string) error
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/daemon/cluster/provider/network.go b/libnetwork/vendor/github.com/docker/docker/daemon/cluster/provider/network.go
new file mode 100644
index 0000000000..f4c72ae13b
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/daemon/cluster/provider/network.go
@@ -0,0 +1,37 @@
+package provider
+
+import "github.com/docker/docker/api/types"
+
+// NetworkCreateRequest is a request when creating a network.
+type NetworkCreateRequest struct {
+ ID string
+ types.NetworkCreateRequest
+}
+
+// NetworkCreateResponse is a response when creating a network.
+type NetworkCreateResponse struct {
+ ID string `json:"Id"`
+}
+
+// VirtualAddress represents a virtual address.
+type VirtualAddress struct {
+ IPv4 string
+ IPv6 string
+}
+
+// PortConfig represents a port configuration.
+type PortConfig struct {
+ Name string
+ Protocol int32
+ TargetPort uint32
+ PublishedPort uint32
+}
+
+// ServiceConfig represents a service configuration.
+type ServiceConfig struct {
+ ID string
+ Name string
+ Aliases map[string][]string
+ VirtualAddresses map[string]*VirtualAddress
+ ExposedPorts []*PortConfig
+}
diff --git a/libnetwork/vendor/github.com/docker/docker/hack/README.md b/libnetwork/vendor/github.com/docker/docker/hack/README.md
new file mode 100644
index 0000000000..326e35e169
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/hack/README.md
@@ -0,0 +1,68 @@
+## About
+
+This directory contains a collection of scripts used to build and manage this
+repository. If there are any issues regarding the intention of a particular
+script (or even part of a certain script), please reach out to us.
+It may help us either refine our current scripts, or add on new ones
+that are appropriate for a given use case.
+
+## DinD (dind.sh)
+
+DinD is a wrapper script which allows Docker to be run inside a Docker
+container. DinD requires the container to
+be run with privileged mode enabled.
+
+## Generate Authors (generate-authors.sh)
+
+Generates AUTHORS; a file with all the names and corresponding emails of
+individual contributors. AUTHORS can be found in the home directory of
+this repository.
+
+## Install (install.sh)
+
+Executable install script for installing Docker. If updates to this are
+desired, please use hack/release.sh during a normal release. The following
+one-liner may be used for script hotfixes:
+
+- `aws s3 cp --acl public-read hack/install.sh s3://get.docker.com/index`
+
+## Make
+
+There are two make files, each with different extensions. Neither are supposed
+to be called directly; only invoke `make`. Both scripts run inside a Docker
+container.
+
+### make.ps1
+
+- The Windows native build script that uses PowerShell semantics; it is limited
+unlike `hack\make.sh` since it does not provide support for the full set of
+operations provided by the Linux counterpart, `make.sh`. However, `make.ps1`
+does provide support for local Windows development and Windows to Windows CI.
+More information is found within `make.ps1` by the author, @jhowardmsft
+
+### make.sh
+
+- Referenced via `make test` when running tests on a local machine,
+or directly referenced when running tests inside a Docker development container.
+- When running on a local machine, `make test` to run all tests found in
+`test`, `test-unit`, `test-integration-cli`, and `test-docker-py` on
+your local machine. The default timeout is set in `make.sh` to 60 minutes
+(`${TIMEOUT:=60m}`), since it currently takes up to an hour to run
+all of the tests.
+- When running inside a Docker development container, `hack/make.sh` does
+not have a single target that runs all the tests. You need to provide a
+single command line with multiple targets that performs the same thing.
+An example referenced from [Run targets inside a development container](https://docs.docker.com/opensource/project/test-and-docs/#run-targets-inside-a-development-container): `root@5f8630b873fe:/go/src/github.com/moby/moby# hack/make.sh dynbinary binary cross test-unit test-integration-cli test-docker-py`
+- For more information related to testing outside the scope of this README,
+refer to
+[Run tests and test documentation](https://docs.docker.com/opensource/project/test-and-docs/)
+
+## Release (release.sh)
+
+Releases any bundles built by `make` on a public AWS S3 bucket.
+For information regarding configuration, please view `release.sh`.
+
+## Vendor (vendor.sh)
+
+A shell script that is a wrapper around Vndr. For information on how to use
+this, please refer to [vndr's README](https://github.com/LK4D4/vndr/blob/master/README.md)
diff --git a/libnetwork/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/README.md b/libnetwork/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/README.md
new file mode 100644
index 0000000000..1cea52526a
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/README.md
@@ -0,0 +1,69 @@
+# Integration Testing on Swarm
+
+IT on Swarm allows you to execute integration test in parallel across a Docker Swarm cluster
+
+## Architecture
+
+### Master service
+
+ - Works as a funker caller
+ - Calls a worker funker (`-worker-service`) with a chunk of `-check.f` filter strings (passed as a file via `-input` flag, typically `/mnt/input`)
+
+### Worker service
+
+ - Works as a funker callee
+ - Executes an equivalent of `TESTFLAGS=-check.f TestFoo|TestBar|TestBaz ... make test-integration-cli` using the bind-mounted API socket (`docker.sock`)
+
+### Client
+
+ - Controls master and workers via `docker stack`
+ - No need to have a local daemon
+
+Typically, the master and workers are supposed to be running on a cloud environment,
+while the client is supposed to be running on a laptop, e.g. Docker for Mac/Windows.
+
+## Requirement
+
+ - Docker daemon 1.13 or later
+ - Private registry for distributed execution with multiple nodes
+
+## Usage
+
+### Step 1: Prepare images
+
+ $ make build-integration-cli-on-swarm
+
+Following environment variables are known to work in this step:
+
+ - `BUILDFLAGS`
+ - `DOCKER_INCREMENTAL_BINARY`
+
+Note: during the transition into Moby Project, you might need to create a symbolic link `$GOPATH/src/github.com/docker/docker` to `$GOPATH/src/github.com/moby/moby`.
+
+### Step 2: Execute tests
+
+ $ ./hack/integration-cli-on-swarm/integration-cli-on-swarm -replicas 40 -push-worker-image YOUR_REGISTRY.EXAMPLE.COM/integration-cli-worker:latest
+
+Following environment variables are known to work in this step:
+
+ - `DOCKER_GRAPHDRIVER`
+ - `DOCKER_EXPERIMENTAL`
+
+#### Flags
+
+Basic flags:
+
+ - `-replicas N`: the number of worker service replicas. i.e. degree of parallelism.
+ - `-chunks N`: the number of chunks. By default, `chunks` == `replicas`.
+ - `-push-worker-image REGISTRY/IMAGE:TAG`: push the worker image to the registry. Note that if you have only single node and hence you do not need a private registry, you do not need to specify `-push-worker-image`.
+
+Experimental flags for mitigating makespan nonuniformity:
+
+ - `-shuffle`: Shuffle the test filter strings
+
+Flags for debugging IT on Swarm itself:
+
+ - `-rand-seed N`: the random seed. This flag is useful for deterministic replaying. By default(0), the timestamp is used.
+ - `-filters-file FILE`: the file contains `-check.f` strings. By default, the file is automatically generated.
+ - `-dry-run`: skip the actual workload
+ - `keep-executor`: do not auto-remove executor containers, which is used for running privileged programs on Swarm
diff --git a/libnetwork/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/agent/vendor.conf b/libnetwork/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/agent/vendor.conf
new file mode 100644
index 0000000000..efd6d6d049
--- /dev/null
+++ b/libnetwork/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/agent/vendor.conf
@@ -0,0 +1,2 @@
+# dependencies specific to worker (i.e. github.com/docker/docker/...) are not vendored here
+github.com/bfirsh/funker-go eaa0a2e06f30e72c9a0b7f858951e581e26ef773
diff --git a/libnetwork/vendor/github.com/docker/docker/opts/mount.go b/libnetwork/vendor/github.com/docker/docker/opts/mount.go
deleted file mode 100644
index ce6383ddca..0000000000
--- a/libnetwork/vendor/github.com/docker/docker/opts/mount.go
+++ /dev/null
@@ -1,171 +0,0 @@
-package opts
-
-import (
- "encoding/csv"
- "fmt"
- "os"
- "strconv"
- "strings"
-
- mounttypes "github.com/docker/docker/api/types/mount"
- "github.com/docker/go-units"
-)
-
-// MountOpt is a Value type for parsing mounts
-type MountOpt struct {
- values []mounttypes.Mount
-}
-
-// Set a new mount value
-func (m *MountOpt) Set(value string) error {
- csvReader := csv.NewReader(strings.NewReader(value))
- fields, err := csvReader.Read()
- if err != nil {
- return err
- }
-
- mount := mounttypes.Mount{}
-
- volumeOptions := func() *mounttypes.VolumeOptions {
- if mount.VolumeOptions == nil {
- mount.VolumeOptions = &mounttypes.VolumeOptions{
- Labels: make(map[string]string),
- }
- }
- if mount.VolumeOptions.DriverConfig == nil {
- mount.VolumeOptions.DriverConfig = &mounttypes.Driver{}
- }
- return mount.VolumeOptions
- }
-
- bindOptions := func() *mounttypes.BindOptions {
- if mount.BindOptions == nil {
- mount.BindOptions = new(mounttypes.BindOptions)
- }
- return mount.BindOptions
- }
-
- tmpfsOptions := func() *mounttypes.TmpfsOptions {
- if mount.TmpfsOptions == nil {
- mount.TmpfsOptions = new(mounttypes.TmpfsOptions)
- }
- return mount.TmpfsOptions
- }
-
- setValueOnMap := func(target map[string]string, value string) {
- parts := strings.SplitN(value, "=", 2)
- if len(parts) == 1 {
- target[value] = ""
- } else {
- target[parts[0]] = parts[1]
- }
- }
-
- mount.Type = mounttypes.TypeVolume // default to volume mounts
- // Set writable as the default
- for _, field := range fields {
- parts := strings.SplitN(field, "=", 2)
- key := strings.ToLower(parts[0])
-
- if len(parts) == 1 {
- switch key {
- case "readonly", "ro":
- mount.ReadOnly = true
- continue
- case "volume-nocopy":
- volumeOptions().NoCopy = true
- continue
- }
- }
-
- if len(parts) != 2 {
- return fmt.Errorf("invalid field '%s' must be a key=value pair", field)
- }
-
- value := parts[1]
- switch key {
- case "type":
- mount.Type = mounttypes.Type(strings.ToLower(value))
- case "source", "src":
- mount.Source = value
- case "target", "dst", "destination":
- mount.Target = value
- case "readonly", "ro":
- mount.ReadOnly, err = strconv.ParseBool(value)
- if err != nil {
- return fmt.Errorf("invalid value for %s: %s", key, value)
- }
- case "bind-propagation":
- bindOptions().Propagation = mounttypes.Propagation(strings.ToLower(value))
- case "volume-nocopy":
- volumeOptions().NoCopy, err = strconv.ParseBool(value)
- if err != nil {
- return fmt.Errorf("invalid value for populate: %s", value)
- }
- case "volume-label":
- setValueOnMap(volumeOptions().Labels, value)
- case "volume-driver":
- volumeOptions().DriverConfig.Name = value
- case "volume-opt":
- if volumeOptions().DriverConfig.Options == nil {
- volumeOptions().DriverConfig.Options = make(map[string]string)
- }
- setValueOnMap(volumeOptions().DriverConfig.Options, value)
- case "tmpfs-size":
- sizeBytes, err := units.RAMInBytes(value)
- if err != nil {
- return fmt.Errorf("invalid value for %s: %s", key, value)
- }
- tmpfsOptions().SizeBytes = sizeBytes
- case "tmpfs-mode":
- ui64, err := strconv.ParseUint(value, 8, 32)
- if err != nil {
- return fmt.Errorf("invalid value for %s: %s", key, value)
- }
- tmpfsOptions().Mode = os.FileMode(ui64)
- default:
- return fmt.Errorf("unexpected key '%s' in '%s'", key, field)
- }
- }
-
- if mount.Type == "" {
- return fmt.Errorf("type is required")
- }
-
- if mount.Target == "" {
- return fmt.Errorf("target is required")
- }
-
- if mount.VolumeOptions != nil && mount.Type != mounttypes.TypeVolume {
- return fmt.Errorf("cannot mix 'volume-*' options with mount type '%s'", mount.Type)
- }
- if mount.BindOptions != nil && mount.Type != mounttypes.TypeBind {
- return fmt.Errorf("cannot mix 'bind-*' options with mount type '%s'", mount.Type)
- }
- if mount.TmpfsOptions != nil && mount.Type != mounttypes.TypeTmpfs {
- return fmt.Errorf("cannot mix 'tmpfs-*' options with mount type '%s'", mount.Type)
- }
-
- m.values = append(m.values, mount)
- return nil
-}
-
-// Type returns the type of this option
-func (m *MountOpt) Type() string {
- return "mount"
-}
-
-// String returns a string repr of this option
-func (m *MountOpt) String() string {
- mounts := []string{}
- for _, mount := range m.values {
- repr := fmt.Sprintf("%s %s %s", mount.Type, mount.Source, mount.Target)
- mounts = append(mounts, repr)
- }
- return strings.Join(mounts, ", ")
-}
-
-// Value returns the mounts
-func (m *MountOpt) Value() []mounttypes.Mount {
- return m.values
-}
diff --git a/libnetwork/vendor/github.com/docker/docker/opts/opts.go b/libnetwork/vendor/github.com/docker/docker/opts/opts.go
index c0f9cebf60..8d82f76792 100644
--- a/libnetwork/vendor/github.com/docker/docker/opts/opts.go
+++ b/libnetwork/vendor/github.com/docker/docker/opts/opts.go
@@ -2,13 +2,12 @@ package opts
import (
"fmt"
- "math/big"
"net"
"path"
"regexp"
"strings"
- "github.com/docker/docker/api/types/filters"
+ units "github.com/docker/go-units"
)
var (
@@ -37,7 +36,10 @@ func NewListOptsRef(values *[]string, validator ValidatorFctType) *ListOpts {
}
func (opts *ListOpts) String() string {
- return fmt.Sprintf("%v", []string((*opts.values)))
+ if len(*opts.values) == 0 {
+ return ""
+ }
+ return fmt.Sprintf("%v", *opts.values)
}
// Set validates if needed the input value and adds it to the
@@ -232,15 +234,6 @@ func ValidateIPAddress(val string) (string, error) {
return "", fmt.Errorf("%s is not an ip address", val)
}
-// ValidateMACAddress validates a MAC address.
-func ValidateMACAddress(val string) (string, error) {
- _, err := net.ParseMAC(strings.TrimSpace(val))
- if err != nil {
- return "", err
- }
- return val, nil
-}
-
// ValidateDNSSearch validates domain for resolvconf search configuration.
// A zero length domain is represented by a dot (.).
func ValidateDNSSearch(val string) (string, error) {
@@ -270,111 +263,6 @@ func ValidateLabel(val string) (string, error) {
return val, nil
}
-// ValidateSysctl validates a sysctl and returns it.
-func ValidateSysctl(val string) (string, error) {
- validSysctlMap := map[string]bool{
- "kernel.msgmax": true,
- "kernel.msgmnb": true,
- "kernel.msgmni": true,
- "kernel.sem": true,
- "kernel.shmall": true,
- "kernel.shmmax": true,
- "kernel.shmmni": true,
- "kernel.shm_rmid_forced": true,
- }
- validSysctlPrefixes := []string{
- "net.",
- "fs.mqueue.",
- }
- arr := strings.Split(val, "=")
- if len(arr) < 2 {
- return "", fmt.Errorf("sysctl '%s' is not whitelisted", val)
- }
- if validSysctlMap[arr[0]] {
- return val, nil
- }
-
- for _, vp := range validSysctlPrefixes {
- if strings.HasPrefix(arr[0], vp) {
- return val, nil
- }
- }
- return "", fmt.Errorf("sysctl '%s' is not whitelisted", val)
-}
-
-// FilterOpt is a flag type for validating filters
-type FilterOpt struct {
- filter filters.Args
-}
-
-// NewFilterOpt returns a new FilterOpt
-func NewFilterOpt() FilterOpt {
- return FilterOpt{filter: filters.NewArgs()}
-}
-
-func (o *FilterOpt) String() string {
- repr, err := filters.ToParam(o.filter)
- if err != nil {
- return "invalid filters"
- }
- return repr
-}
-
-// Set sets the value of the opt by parsing the command line value
-func (o *FilterOpt) Set(value string) error {
- var err error
- o.filter, err = filters.ParseFlag(value, o.filter)
- return err
-}
-
-// Type returns the option type
-func (o *FilterOpt) Type() string {
- return "filter"
-}
-
-// Value returns the value of this option
-func (o *FilterOpt) Value() filters.Args {
- return o.filter
-}
-
-// NanoCPUs is a type for fixed point fractional number.
-type NanoCPUs int64
-
-// String returns the string format of the number
-func (c *NanoCPUs) String() string {
- return big.NewRat(c.Value(), 1e9).FloatString(3)
-}
-
-// Set sets the value of the NanoCPU by passing a string
-func (c *NanoCPUs) Set(value string) error {
- cpus, err := ParseCPUs(value)
- *c = NanoCPUs(cpus)
- return err
-}
-
-// Type returns the type
-func (c *NanoCPUs) Type() string {
- return "decimal"
-}
-
-// Value returns the value in int64
-func (c *NanoCPUs) Value() int64 {
- return int64(*c)
-}
-
-// ParseCPUs takes a string ratio and returns an integer value of nano cpus
-func ParseCPUs(value string) (int64, error) {
- cpu, ok := new(big.Rat).SetString(value)
- if !ok {
- return 0, fmt.Errorf("failed to parse %v as a rational number", value)
- }
- nano := cpu.Mul(cpu, big.NewRat(1e9, 1))
- if !nano.IsInt() {
- return 0, fmt.Errorf("value is too precise")
- }
- return nano.Num().Int64(), nil
-}
-
// ParseLink parses and validates the specified string as a link format (name:alias)
func ParseLink(val string) (string, string, error) {
if val == "" {
@@ -397,8 +285,43 @@ func ParseLink(val string) (string, string, error) {
return arr[0], arr[1], nil
}
-// ValidateLink validates that the specified string has a valid link format (containerName:alias).
-func ValidateLink(val string) (string, error) {
- _, _, err := ParseLink(val)
- return val, err
+// MemBytes is a type for human readable memory bytes (like 128M, 2g, etc)
+type MemBytes int64
+
+// String returns the string format of the human readable memory bytes
+func (m *MemBytes) String() string {
+ // NOTE: In spf13/pflag/flag.go, "0" is considered as "zero value" while "0 B" is not.
+ // We return "0" in case value is 0 here so that the default value is hidden.
+ // (Sometimes "default 0 B" is actually misleading)
+ if m.Value() != 0 {
+ return units.BytesSize(float64(m.Value()))
+ }
+ return "0"
+}
+
+// Set sets the value of the MemBytes by passing a string
+func (m *MemBytes) Set(value string) error {
+ val, err := units.RAMInBytes(value)
+ *m = MemBytes(val)
+ return err
+}
+
+// Type returns the type
+func (m *MemBytes) Type() string {
+ return "bytes"
+}
+
+// Value returns the value in int64
+func (m *MemBytes) Value() int64 {
+ return int64(*m)
+}
+
+// UnmarshalJSON is the customized unmarshaler for MemBytes
+func (m *MemBytes) UnmarshalJSON(s []byte) error {
+ if len(s) <= 2 || s[0] != '"' || s[len(s)-1] != '"' {
+ return fmt.Errorf("invalid size: %q", s)
+ }
+ val, err := units.RAMInBytes(string(s[1 : len(s)-1]))
+ *m = MemBytes(val)
+ return err
}
diff --git a/libnetwork/vendor/github.com/docker/docker/opts/port.go b/libnetwork/vendor/github.com/docker/docker/opts/port.go
deleted file mode 100644
index 020a5d1e1c..0000000000
--- a/libnetwork/vendor/github.com/docker/docker/opts/port.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package opts
-
-import (
- "encoding/csv"
- "fmt"
- "regexp"
- "strconv"
- "strings"
-
- "github.com/docker/docker/api/types/swarm"
- "github.com/docker/go-connections/nat"
-)
-
-const (
- portOptTargetPort = "target"
- portOptPublishedPort = "published"
- portOptProtocol = "protocol"
- portOptMode = "mode"
-)
-
-// PortOpt represents a port config in swarm mode.
-type PortOpt struct {
- ports []swarm.PortConfig
-}
-
-// Set a new port value
-func (p *PortOpt) Set(value string) error {
- longSyntax, err := regexp.MatchString(`\w+=\w+(,\w+=\w+)*`, value)
- if err != nil {
- return err
- }
- if longSyntax {
- csvReader := csv.NewReader(strings.NewReader(value))
- fields, err := csvReader.Read()
- if err != nil {
- return err
- }
-
- pConfig := swarm.PortConfig{}
- for _, field := range fields {
- parts := strings.SplitN(field, "=", 2)
- if len(parts) != 2 {
- return fmt.Errorf("invalid field %s", field)
- }
-
- key := strings.ToLower(parts[0])
- value := strings.ToLower(parts[1])
-
- switch key {
- case portOptProtocol:
- if value != string(swarm.PortConfigProtocolTCP) && value != string(swarm.PortConfigProtocolUDP) {
- return fmt.Errorf("invalid protocol value %s", value)
- }
-
- pConfig.Protocol = swarm.PortConfigProtocol(value)
- case portOptMode:
- if value != string(swarm.PortConfigPublishModeIngress) && value != string(swarm.PortConfigPublishModeHost) {
- return fmt.Errorf("invalid publish mode value %s", value)
- }
-
- pConfig.PublishMode = swarm.PortConfigPublishMode(value)
- case portOptTargetPort:
- tPort, err := strconv.ParseUint(value, 10, 16)
- if err != nil {
- return err
- }
-
- pConfig.TargetPort = uint32(tPort)
- case portOptPublishedPort:
- pPort, err := strconv.ParseUint(value, 10, 16)
- if err != nil {
- return err
- }
-
- pConfig.PublishedPort = uint32(pPort)
- default:
- return fmt.Errorf("invalid field key %s", key)
- }
- }
-
- if pConfig.TargetPort == 0 {
- return fmt.Errorf("missing mandatory field %q", portOptTargetPort)
- }
-
- if pConfig.PublishMode == "" {
- pConfig.PublishMode = swarm.PortConfigPublishModeIngress
- }
-
- if pConfig.Protocol == "" {
- pConfig.Protocol = swarm.PortConfigProtocolTCP
- }
-
- p.ports = append(p.ports, pConfig)
- } else {
- // short syntax
- portConfigs := []swarm.PortConfig{}
- // We can ignore errors because the format was already validated by ValidatePort
- ports, portBindings, _ := nat.ParsePortSpecs([]string{value})
-
- for port := range ports {
- portConfigs = append(portConfigs, ConvertPortToPortConfig(port, portBindings)...)
- }
- p.ports = append(p.ports, portConfigs...)
- }
- return nil
-}
-
-// Type returns the type of this option
-func (p *PortOpt) Type() string {
- return "port"
-}
-
-// String returns a string repr of this option
-func (p *PortOpt) String() string {
- ports := []string{}
- for _, port := range p.ports {
- repr := fmt.Sprintf("%v:%v/%s/%s", port.PublishedPort, port.TargetPort, port.Protocol, port.PublishMode)
- ports = append(ports, repr)
- }
- return strings.Join(ports, ", ")
-}
-
-// Value returns the ports
-func (p *PortOpt) Value() []swarm.PortConfig {
- return p.ports
-}
-
-// ConvertPortToPortConfig converts ports to the swarm type
-func ConvertPortToPortConfig(
- port nat.Port,
- portBindings map[nat.Port][]nat.PortBinding,
-) []swarm.PortConfig {
- ports := []swarm.PortConfig{}
-
- for _, binding := range portBindings[port] {
- hostPort, _ := strconv.ParseUint(binding.HostPort, 10, 16)
- ports = append(ports, swarm.PortConfig{
- //TODO Name: ?
- Protocol: swarm.PortConfigProtocol(strings.ToLower(port.Proto())),
- TargetPort: uint32(port.Int()),
- PublishedPort: uint32(hostPort),
- PublishMode: swarm.PortConfigPublishModeIngress,
- })
- }
- return ports
-}
diff --git a/libnetwork/vendor/github.com/docker/docker/opts/secret.go b/libnetwork/vendor/github.com/docker/docker/opts/secret.go
deleted file mode 100644
index b77a33f685..0000000000
--- a/libnetwork/vendor/github.com/docker/docker/opts/secret.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package opts
-
-import (
- "encoding/csv"
- "fmt"
- "os"
- "path/filepath"
- "strconv"
- "strings"
-
- "github.com/docker/docker/api/types"
-)
-
-// SecretOpt is a Value type for parsing secrets
-type SecretOpt struct {
- values []*types.SecretRequestOption
-}
-
-// Set a new secret value
-func (o *SecretOpt) Set(value string) error {
- csvReader := csv.NewReader(strings.NewReader(value))
- fields, err := csvReader.Read()
- if err != nil {
- return err
- }
-
- options := &types.SecretRequestOption{
- Source: "",
- Target: "",
- UID: "0",
- GID: "0",
- Mode: 0444,
- }
-
- // support a simple syntax of --secret foo
- if len(fields) == 1 {
- options.Source = fields[0]
- options.Target = fields[0]
- o.values = append(o.values, options)
- return nil
- }
-
- for _, field := range fields {
- parts := strings.SplitN(field, "=", 2)
- key := strings.ToLower(parts[0])
-
- if len(parts) != 2 {
- return fmt.Errorf("invalid field '%s' must be a key=value pair", field)
- }
-
- value := parts[1]
- switch key {
- case "source":
- options.Source = value
- case "target":
- tDir, _ := filepath.Split(value)
- if tDir != "" {
- return fmt.Errorf("target must not be a path")
- }
- options.Target = value
- case "uid":
- options.UID = value
- case "gid":
- options.GID = value
- case "mode":
- m, err := strconv.ParseUint(value, 0, 32)
- if err != nil {
- return fmt.Errorf("invalid mode specified: %v", err)
- }
-
- options.Mode = os.FileMode(m)
- default:
- if len(fields) == 1 && value == "" {
-
- } else {
- return fmt.Errorf("invalid field in secret request: %s", key)
- }
- }
- }
-
- if options.Source == "" {
- return fmt.Errorf("source is required")
- }
-
- o.values = append(o.values, options)
- return nil
-}
-
-// Type returns the type of this option
-func (o *SecretOpt) Type() string {
- return "secret"
-}
-
-// String returns a string repr of this option
-func (o *SecretOpt) String() string {
- secrets := []string{}
- for _, secret := range o.values {
- repr := fmt.Sprintf("%s -> %s", secret.Source, secret.Target)
- secrets = append(secrets, repr)
- }
- return strings.Join(secrets, ", ")
-}
-
-// Value returns the secret requests
-func (o *SecretOpt) Value() []*types.SecretRequestOption {
- return o.values
-}
diff --git a/libnetwork/vendor/github.com/docker/docker/opts/throttledevice.go b/libnetwork/vendor/github.com/docker/docker/opts/throttledevice.go
deleted file mode 100644
index 65dd3ebf68..0000000000
--- a/libnetwork/vendor/github.com/docker/docker/opts/throttledevice.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package opts
-
-import (
- "fmt"
- "strconv"
- "strings"
-
- "github.com/docker/docker/api/types/blkiodev"
- "github.com/docker/go-units"
-)
-
-// ValidatorThrottleFctType defines a validator function that returns a validated struct and/or an error.
-type ValidatorThrottleFctType func(val string) (*blkiodev.ThrottleDevice, error)
-
-// ValidateThrottleBpsDevice validates that the specified string has a valid device-rate format.
-func ValidateThrottleBpsDevice(val string) (*blkiodev.ThrottleDevice, error) {
- split := strings.SplitN(val, ":", 2)
- if len(split) != 2 {
- return nil, fmt.Errorf("bad format: %s", val)
- }
- if !strings.HasPrefix(split[0], "/dev/") {
- return nil, fmt.Errorf("bad format for device path: %s", val)
- }
- rate, err := units.RAMInBytes(split[1])
- if err != nil {
- return nil, fmt.Errorf("invalid rate for device: %s. The correct format is 
+
+