@@ -11,7 +11,7 @@ github.com/coreos/etcd 925d1d74cec8c3b169c52fd4b2dc234a35934fce

 github.com/coreos/go-systemd b4a58d95188dd092ae20072bac14cece0e67c388

 github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d

-github.com/docker/docker 9c96768eae4b3a65147b47a55c850c103ab8972d

+github.com/docker/docker e18f50891a92786c43d467e012a2404edab416d3 https://github.com/fcrisciani/docker

 github.com/docker/go-connections 34b5052da6b11e27f5f2e357b38b571ddddd3928

 github.com/docker/go-events 2e7d352816128aa84f4d29b2a21d400133701a0d

 github.com/docker/go-units 8e2d4523730c73120e10d4652f36ad6010998f4e

@@ -19,11 +19,11 @@ github.com/docker/libkv 1d8431073ae03cdaedb198a89722f3aab6d418ef

 github.com/godbus/dbus 5f6efc7ef2759c81b7ba876593971bfce311eab3

 github.com/gogo/protobuf 8d70fb3182befc465c4a1eac8ad4d38ff49778e2

-github.com/golang/protobuf/proto f7137ae6b19afbfd61a94b746fda3b3fe0491874

+github.com/golang/protobuf f7137ae6b19afbfd61a94b746fda3b3fe0491874

 github.com/gorilla/context 215affda49addc4c8ef7e2534915df2c8c35c6cd

 github.com/gorilla/mux 8096f47503459bcc74d1f4c487b7e6e42e5746b5

-github.com/hashicorp/consul/api 954aec66231b79c161a4122b023fbcad13047f79

-github.com/hashicorp/go-msgpack/codec 71c2886f5a673a35f909803f38ece5810165097b

+github.com/hashicorp/consul 954aec66231b79c161a4122b023fbcad13047f79

+github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b

 github.com/hashicorp/go-multierror 2167c8ec40776024589f483a6b836489e47e1049

 github.com/hashicorp/memberlist v0.1.0

 github.com/sean-/seed e2103e2c35297fb7e17febb81e49b312087a2372

@@ -31,11 +31,13 @@ github.com/hashicorp/go-sockaddr acd314c5781ea706c710d9ea70069fd2e110d61d

 github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870

 github.com/mattn/go-shellwords 525bedee691b5a8df547cb5cf9f86b7fb1883e24

 github.com/miekg/dns d27455715200c7d3e321a1e5cadb27c9ee0b0f02

-github.com/opencontainers/runc/libcontainer ba1568de399395774ad84c2ace65937814c542ed

-github.com/samuel/go-zookeeper/zk d0e0d8e11f318e000a8cc434616d69e329edc374

+github.com/opencontainers/runc ba1568de399395774ad84c2ace65937814c542ed

+github.com/opencontainers/image-spec 56b55a17598362bd1bf78c9c307738335a2510eb

+github.com/opencontainers/go-digest eaa60544f31ccf3b0653b1a118b76d33418ff41b

+github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374

 github.com/seccomp/libseccomp-golang 1b506fc7c24eec5a3693cdcbed40d9c226cfc6a1

 github.com/stretchr/testify dab07ac62d4905d3e48d17dc549c684ac3b7c15a

-github.com/syndtr/gocapability/capability 2c00daeb6c3b45114c80ac44119e7b8801fdd852

+github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852

 github.com/ugorji/go f1f1a805ed361a0e078bb537e4ea78cd37dcf065

 github.com/vishvananda/netlink 1e86b2bee5b6a7d377e4c02bb7f98209d6a7297c

 github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25

@@ -176,7 +176,7 @@

    END OF TERMS AND CONDITIONS

-   Copyright 2013-2016 Docker, Inc.

+   Copyright 2013-2017 Docker, Inc.

    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

@@ -1,5 +1,5 @@

 Docker

-Copyright 2012-2016 Docker, Inc.

+Copyright 2012-2017 Docker, Inc.

 This product includes software developed at Docker, Inc. (https://www.docker.com).

@@ -1,270 +1,80 @@

-Docker: the container engine [![Release](https://img.shields.io/github/release/docker/docker.svg)](https://github.com/docker/docker/releases/latest)

-============================

+### Docker users, see [Moby and Docker](https://mobyproject.org/#moby-and-docker) to clarify the relationship between the projects

-Docker is an open source project to pack, ship and run any application

-as a lightweight container.

+### Docker maintainers and contributors, see [Transitioning to Moby](#transitioning-to-moby) for more details

-Docker containers are both *hardware-agnostic* and *platform-agnostic*.

-This means they can run anywhere, from your laptop to the largest

-cloud compute instance and everything in between - and they don't require

-you to use a particular language, framework or packaging system. That

-makes them great building blocks for deploying and scaling web apps,

-databases, and backend services without depending on a particular stack

-or provider.

+The Moby Project

+================

-Docker began as an open-source implementation of the deployment engine which

-powered [dotCloud](http://web.archive.org/web/20130530031104/https://www.dotcloud.com/),

-a popular Platform-as-a-Service. It benefits directly from the experience

-accumulated over several years of large-scale operation and support of hundreds

-of thousands of applications and databases.

+![Moby Project logo](docs/static_files/moby-project-logo.png "The Moby Project")

-![Docker logo](docs/static_files/docker-logo-compressed.png "Docker")

+Moby is an open-source project created by Docker to advance the software containerization movement.

+It provides a “Lego set” of dozens of components, the framework for assembling them into custom container-based systems, and a place for all container enthusiasts to experiment and exchange ideas.

-## Security Disclosure

+# Moby

-Security is very important to us. If you have any issue regarding security,

-please disclose the information responsibly by sending an email to

-security@docker.com and not by creating a GitHub issue.

+## Overview

-## Better than VMs

+At the core of Moby is a framework to assemble specialized container systems.

+It provides:

-A common method for distributing applications and sandboxing their

-execution is to use virtual machines, or VMs. Typical VM formats are

-VMware's vmdk, Oracle VirtualBox's vdi, and Amazon EC2's ami. In theory

-these formats should allow every developer to automatically package

-their application into a "machine" for easy distribution and deployment.

-In practice, that almost never happens, for a few reasons:

+- A library of containerized components for all vital aspects of a container system: OS, container runtime, orchestration, infrastructure management, networking, storage, security, build, image distribution, etc.

+- Tools to assemble the components into runnable artifacts for a variety of platforms and architectures: bare metal (both x86 and Arm); executables for Linux, Mac and Windows; VM images for popular cloud and virtualization providers.

+- A set of reference assemblies which can be used as-is, modified, or used as inspiration to create your own.

-  * *Size*: VMs are very large which makes them impractical to store

-     and transfer.

-  * *Performance*: running VMs consumes significant CPU and memory,

-    which makes them impractical in many scenarios, for example local

-    development of multi-tier applications, and large-scale deployment

-    of cpu and memory-intensive applications on large numbers of

-    machines.

-  * *Portability*: competing VM environments don't play well with each

-     other. Although conversion tools do exist, they are limited and

-     add even more overhead.

-  * *Hardware-centric*: VMs were designed with machine operators in

-    mind, not software developers. As a result, they offer very

-    limited tooling for what developers need most: building, testing

-    and running their software. For example, VMs offer no facilities

-    for application versioning, monitoring, configuration, logging or

-    service discovery.

+All Moby components are containers, so creating new components is as easy as building a new OCI-compatible container.

-By contrast, Docker relies on a different sandboxing method known as

-*containerization*. Unlike traditional virtualization, containerization

-takes place at the kernel level. Most modern operating system kernels

-now support the primitives necessary for containerization, including

-Linux with [openvz](https://openvz.org),

-[vserver](http://linux-vserver.org) and more recently

-[lxc](https://linuxcontainers.org/), Solaris with

-[zones](https://docs.oracle.com/cd/E26502_01/html/E29024/preface-1.html#scrolltoc),

-and FreeBSD with

-[Jails](https://www.freebsd.org/doc/handbook/jails.html).

+## Principles

-Docker builds on top of these low-level primitives to offer developers a

-portable format and runtime environment that solves all four problems.

-Docker containers are small (and their transfer can be optimized with

-layers), they have basically zero memory and cpu overhead, they are

-completely portable, and are designed from the ground up with an

-application-centric design.

+Moby is an open project guided by strong principles, but modular, flexible and without too strong an opinion on user experience, so it is open to the community to help set its direction.

+The guiding principles are:

-Perhaps best of all, because Docker operates at the OS level, it can still be

-run inside a VM!

+- Batteries included but swappable: Moby includes enough components to build fully featured container system, but its modular architecture ensures that most of the components can be swapped by different implementations.

+- Usable security: Moby will provide secure defaults without compromising usability.

+- Container centric: Moby is built with containers, for running containers.

-## Plays well with others

+With Moby, you should be able to describe all the components of your distributed application, from the high-level configuration files down to the kernel you would like to use and build and deploy it easily.

-Docker does not require you to buy into a particular programming

-language, framework, packaging system, or configuration language.

+Moby uses [containerd](https://github.com/containerd/containerd) as the default container runtime.

-Is your application a Unix process? Does it use files, tcp connections,

-environment variables, standard Unix streams and command-line arguments

-as inputs and outputs? Then Docker can run it.

+## Audience

-Can your application's build be expressed as a sequence of such

-commands? Then Docker can build it.

+Moby is recommended for anyone who wants to assemble a container-based system. This includes:

-## Escape dependency hell

+- Hackers who want to customize or patch their Docker build

+- System engineers or integrators building a container system

+- Infrastructure providers looking to adapt existing container systems to their environment

+- Container enthusiasts who want to experiment with the latest container tech

+- Open-source developers looking to test their project in a variety of different systems

+- Anyone curious about Docker internals and how it’s built

-A common problem for developers is the difficulty of managing all

-their application's dependencies in a simple and automated way.

+Moby is NOT recommended for:

-This is usually difficult for several reasons:

+- Application developers looking for an easy way to run their applications in containers. We recommend Docker CE instead.

+- Enterprise IT and development teams looking for a ready-to-use, commercially supported container platform. We recommend Docker EE instead.

+- Anyone curious about containers and looking for an easy way to learn. We recommend the docker.com website instead.

-  * *Cross-platform dependencies*. Modern applications often depend on

-    a combination of system libraries and binaries, language-specific

-    packages, framework-specific modules, internal components

-    developed for another project, etc. These dependencies live in

-    different "worlds" and require different tools - these tools

-    typically don't work well with each other, requiring awkward

-    custom integrations.

+# Transitioning to Moby

-  * *Conflicting dependencies*. Different applications may depend on

-    different versions of the same dependency. Packaging tools handle

-    these situations with various degrees of ease - but they all

-    handle them in different and incompatible ways, which again forces

-    the developer to do extra work.

+Docker is transitioning all of its open source collaborations to the Moby project going forward.

+During the transition, all open source activity should continue as usual.

-  * *Custom dependencies*. A developer may need to prepare a custom

-    version of their application's dependency. Some packaging systems

-    can handle custom versions of a dependency, others can't - and all

-    of them handle it differently.

+We are proposing the following list of changes:

+- splitting up the engine into more open components

+- removing the docker UI, SDK etc to keep them in the Docker org

+- clarifying that the project is not limited to the engine, but to the assembly of all the individual components of the Docker platform

+- open-source new tools & components which we currently use to assemble the Docker product, but could benefit the community

+- defining an open, community-centric governance inspired by the Fedora project (a very successful example of balancing the needs of the community with the constraints of the primary corporate sponsor)

-Docker solves the problem of dependency hell by giving the developer a simple

-way to express *all* their application's dependencies in one place, while

-streamlining the process of assembling them. If this makes you think of

-[XKCD 927](https://xkcd.com/927/), don't worry. Docker doesn't

-*replace* your favorite packaging systems. It simply orchestrates

-their use in a simple and repeatable way. How does it do that? With

-layers.

+-----

-Docker defines a build as running a sequence of Unix commands, one

-after the other, in the same container. Build commands modify the

-contents of the container (usually by installing new files on the

-filesystem), the next command modifies it some more, etc. Since each

-build command inherits the result of the previous commands, the

-*order* in which the commands are executed expresses *dependencies*.

-

-Here's a typical Docker build process:

-

-```bash

-FROM ubuntu:12.04

-RUN apt-get update && apt-get install -y python python-pip curl

-RUN curl -sSL https://github.com/shykes/helloflask/archive/master.tar.gz | tar -xzv

-RUN cd helloflask-master && pip install -r requirements.txt

-```

-

-Note that Docker doesn't care *how* dependencies are built - as long

-as they can be built by running a Unix command in a container.

-

-

-Getting started

-===============

-

-Docker can be installed either on your computer for building applications or

-on servers for running them. To get started, [check out the installation

-instructions in the

-documentation](https://docs.docker.com/engine/installation/).

-

-Usage examples

-==============

-

-Docker can be used to run short-lived commands, long-running daemons

-(app servers, databases, etc.), interactive shell sessions, etc.

-

-You can find a [list of real-world

-examples](https://docs.docker.com/engine/examples/) in the

-documentation.

-

-Under the hood

-

-Under the hood, Docker is built on the following components:

-

-* The

-  [cgroups](https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt)

-  and

-  [namespaces](http://man7.org/linux/man-pages/man7/namespaces.7.html)

-  capabilities of the Linux kernel

-* The [Go](https://golang.org) programming language

-* The [Docker Image Specification](https://github.com/docker/docker/blob/master/image/spec/v1.md)

-* The [Libcontainer Specification](https://github.com/opencontainers/runc/blob/master/libcontainer/SPEC.md)

-

-Contributing to Docker [![GoDoc](https://godoc.org/github.com/docker/docker?status.svg)](https://godoc.org/github.com/docker/docker)

-======================

-

-| **Master** (Linux) | **Experimental** (Linux) | **Windows** | **FreeBSD** |

-|------------------|----------------------|---------|---------|

-| [![Jenkins Build Status](https://jenkins.dockerproject.org/view/Docker/job/Docker%20Master/badge/icon)](https://jenkins.dockerproject.org/view/Docker/job/Docker%20Master/) | [![Jenkins Build Status](https://jenkins.dockerproject.org/view/Docker/job/Docker%20Master%20%28experimental%29/badge/icon)](https://jenkins.dockerproject.org/view/Docker/job/Docker%20Master%20%28experimental%29/) | [![Build Status](http://jenkins.dockerproject.org/job/Docker%20Master%20(windows)/badge/icon)](http://jenkins.dockerproject.org/job/Docker%20Master%20(windows)/) | [![Build Status](http://jenkins.dockerproject.org/job/Docker%20Master%20(freebsd)/badge/icon)](http://jenkins.dockerproject.org/job/Docker%20Master%20(freebsd)/) |

-

-Want to hack on Docker? Awesome! We have [instructions to help you get

-started contributing code or documentation](https://docs.docker.com/opensource/project/who-written-for/).

-

-These instructions are probably not perfect, please let us know if anything

-feels wrong or incomplete. Better yet, submit a PR and improve them yourself.

-

-Getting the development builds

-==============================

-

-Want to run Docker from a master build? You can download

-master builds at [master.dockerproject.org](https://master.dockerproject.org).

-They are updated with each commit merged into the master branch.

-

-Don't know how to use that super cool new feature in the master build? Check

-out the master docs at

-[docs.master.dockerproject.org](http://docs.master.dockerproject.org).

-

-How the project is run

-======================

-

-Docker is a very, very active project. If you want to learn more about how it is run,

-or want to get more involved, the best place to start is [the project directory](https://github.com/docker/docker/tree/master/project).

-

-We are always open to suggestions on process improvements, and are always looking for more maintainers.

-

-### Talking to other Docker users and contributors

-

-<table class="tg">

-  <col width="45%">

-  <col width="65%">

-  <tr>

-    <td>Internet&nbsp;Relay&nbsp;Chat&nbsp;(IRC)</td>

-    <td>

-      <p>

-        IRC is a direct line to our most knowledgeable Docker users; we have

-        both the  <code>#docker</code> and <code>#docker-dev</code> group on

-        <strong>irc.freenode.net</strong>.

-        IRC is a rich chat protocol but it can overwhelm new users. You can search

-        <a href="https://botbot.me/freenode/docker/#" target="_blank">our chat archives</a>.

-      </p>

-      Read our <a href="https://docs.docker.com/opensource/get-help/#/irc-quickstart" target="_blank">IRC quickstart guide</a> for an easy way to get started.

-    </td>

-  </tr>

-  <tr>

-    <td>Docker Community Forums</td>

-    <td>

-      The <a href="https://forums.docker.com/c/open-source-projects/de" target="_blank">Docker Engine</a>

-      group is for users of the Docker Engine project.

-    </td>

-  </tr>

-  <tr>

-    <td>Google Groups</td>

-    <td>

-      The <a href="https://groups.google.com/forum/#!forum/docker-dev"

-      target="_blank">docker-dev</a> 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 <a

-      href="mailto:docker-dev+subscribe@googlegroups.com">docker-dev+subscribe@googlegroups.com</a>.

-      You'll receive a join-request message; simply reply to the message to

-      confirm your subscription.

-    </td>

-  </tr>

-  <tr>

-    <td>Twitter</td>

-    <td>

-      You can follow <a href="https://twitter.com/docker/" target="_blank">Docker's Twitter feed</a>

-      to get updates on our products. You can also tweet us questions or just

-      share blogs or stories.

-    </td>

-  </tr>

-  <tr>

-    <td>Stack Overflow</td>

-    <td>

-      Stack Overflow has over 7000 Docker questions listed. We regularly

-      monitor <a href="https://stackoverflow.com/search?tab=newest&q=docker" target="_blank">Docker questions</a>

-      and so do many other knowledgeable Docker users.

-    </td>

-  </tr>

-</table>

-

-### 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.

@@ -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

@@ -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 {

@@ -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.

new file mode 100644

@@ -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"`

+}

new file mode 100644

@@ -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"`

+}

@@ -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"`

 }

@@ -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 ""

-}

@@ -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()

 	}