@@ -2,7 +2,7 @@

 # -----------------------------------------------------------------------------------------

 # This file describes the standard way to build Docker in a container on Windows

-# Server 2016.

+# Server 2016 or Windows 10.

 #

 # Maintainer: @jhowardmsft

 # -----------------------------------------------------------------------------------------

@@ -11,21 +11,25 @@

 # Prerequisites:

 # --------------

 #

-# 1. Windows Server 2016 with all Windows updates applied. Pre-release versions

-#    of Windows are not supported (eg Windows Server 2016 TP5). The build number

-#    must be at least 14393. This can be confirmed, for example, by running the

-#    following from an elevated PowerShell prompt - this sample output is from a 

-#    fully up to date machine as at late October 2016:

+# 1. Windows Server 2016 or Windows 10 with all Windows updates applied. The major 

+#    build number must be at least 14393. This can be confirmed, for example, by 

+#    running the following from an elevated PowerShell prompt - this sample output 

+#    is from a fully up to date machine as at mid-November 2016:

 #

 #    >> PS C:\> $(gin).WindowsBuildLabEx

-#    >> 14393.321.amd64fre.rs1_release_inmarket.161004-2338

+#    >> 14393.447.amd64fre.rs1_release_inmarket.161102-0100

 #

 # 2. Git for Windows (or another git client) must be installed. https://git-scm.com/download/win.

 #

 # 3. The machine must be configured to run containers. For example, by following

 #    the quick start guidance at https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start or

 #    https://github.com/docker/labs/blob/master/windows/windows-containers/Setup.md

-

+#

+# 4. If building in a Hyper-V VM: For Windows Server 2016 using Windows Server

+#    containers as the default option, it is recommended you have at least 1GB 

+#    of memory assigned; For Windows 10 where Hyper-V Containers are employed, you

+#    should have at least 4GB of memory assigned. Note also, to run Hyper-V 

+#    containers in a VM, it is necessary to configure the VM for nested virtualization.

 # -----------------------------------------------------------------------------------------

@@ -63,18 +67,16 @@

 #    >>   docker build -t nativebuildimage -f Dockerfile.windows .

 #

 #

-# 4. Build the docker executable binaries in a container:

+# 4. Build the docker executable binaries:

 #

-#    >>   docker run --name binaries nativebuildimage sh -c 'cd /c/go/src/github.com/docker/docker; hack/make.sh binary'

+#    >>   docker run --name binaries nativebuildimage hack\make.ps1 -Binary

 #

 #

-# 5. Copy the binaries out of the above container, replacing HostPath with an appropriate destination 

+# 5. Copy the binaries out of the container, replacing HostPath with an appropriate destination 

 #    folder on the host system where you want the binaries to be located.

 #

-#    >>   $v=$(Get-Content ".\VERSION" -raw).ToString().Replace("`n","").Trim()

-#    >>   docker cp binaries:C:\go\src\github.com\docker\docker\bundles\$v\binary-client\docker-$v.exe C:\HostPath\docker.exe

-#    >>   docker cp binaries:C:\go\src\github.com\docker\docker\bundles\$v\binary-daemon\dockerd.exe C:\HostPath\dockerd.exe

-#    >>   docker cp binaries:C:\go\src\github.com\docker\docker\bundles\$v\binary-daemon\docker-proxy-$v.exe C:\HostPath\docker-proxy.exe

+#    >>   docker cp binaries:C:\go\src\github.com\docker\docker\bundles\docker.exe C:\HostPath\docker.exe

+#    >>   docker cp binaries:C:\go\src\github.com\docker\docker\bundles\dockerd.exe C:\HostPath\dockerd.exe

 #

 #

 # 6. (Optional) Remove the interim container holding the built executable binaries:

@@ -88,6 +90,39 @@

 #    image which has all the components required to build the binaries already installed.

 #

 #    >>    docker rmi nativebuildimage

+#

+

+# -----------------------------------------------------------------------------------------

+

+

+#  The validation tests can either run in a container, or directly on the host. To run in a

+#  container, ensure you have created the nativebuildimage above. Then run the following

+#  from an (elevated) Windows PowerShell prompt:

+#

+#    >>   docker run --rm nativebuildimage hack\make.ps1 -DCO -PkgImports -GoFormat

+

+# To run the validation tests on the host, from the root of the repository, run the

+# following from a Windows PowerShell prompt (elevation is not required): (Note Go

+# must be installed to run these tests)

+#

+#    >>   hack\make.ps1 -DCO -PkgImports -GoFormat

+

+# -----------------------------------------------------------------------------------------

+

+

+#  To run unit tests, ensure you have created the nativebuildimage above. Then run the

+#  following from an (elevated) Windows PowerShell prompt:

+#

+#    >>   docker run --rm nativebuildimage hack\make.ps1 -TestUnit

+

+

+# -----------------------------------------------------------------------------------------

+

+

+#  To run all tests and binary build, ensure you have created the nativebuildimage above. Then 

+# run the following from an (elevated) Windows PowerShell prompt:

+#

+#    >>   docker run nativebuildimage hack\make.ps1 -All

 # -----------------------------------------------------------------------------------------

@@ -96,28 +131,26 @@

 # Important notes:

 # ---------------

 #

-# The posix utilities from git aren't usable interactively as at October 2016. This

-# is because they require a console window which isn't present in a container in Windows.

-# See the example at the top of this file. Do NOT use -it in that docker run. It will not work.

+# Don't attempt to use a bind-mount to pass a local directory as the bundles target

+# directory. It does not work (golang attempts for follow a mapped folder incorrectly). 

+# Instead, use docker cp as per the example.

 #

-# Don't attempt to use a volume for passing the source through to the container. The posix utilities will

-# balk at reparse points. 

+# go.zip is not removed from the image as it is used by the Windows CI servers

+# to ensure the host and image are running consistent versions of go.

 #

-# The downloaded files are not cleared from the image. go.zip is used by the Windows

-# CI servers to ensure the host and image are running consistent versions of go.

+# Nanoserver support is a work in progress. Although the image will build if the 

+# FROM statement is updated, it will not work when running autogen through hack\make.ps1. 

+# It is suspected that the required GCC utilities (eg gcc, windres, windmc) silently

+# quit due to the use of console hooks which are not available.

 #

-# The GIT installer isn't very good at unattended install. We use techniques described

-# at the links below to force it to set the path and other options accordingly. 

-# >> http://superuser.com/questions/944576/git-for-windows-silent-install-silent-arguments 

-# and follow through to installer at

-# >> https://github.com/ferventcoder/chocolatey-packages/blob/master/automatic/git.install/tools/chocolateyInstall.ps1

+# The docker integration tests do not currently run in a container on Windows, predominantly

+# due to Windows not supporting privileged mode, so anything using a volume would fail.

+# They (along with the rest of the docker CI suite) can be run using 

+# https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.

 #

-# As of October 2016, this does not work on Windows 10 client, just Windows Server 2016,

-# and only with the default isolation mode (process). It does not work with isolation mode

-# set to Hyper-V containers (hyperv).

-

 # -----------------------------------------------------------------------------------------

+

 # The number of build steps below are explicitly minimised to improve performance.

 FROM microsoft/windowsservercore

@@ -128,55 +161,102 @@ SHELL ["powershell", "-command"]

 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

 #  - FROM_DOCKERFILE is used for detection of building within a container.

 ENV GO_VERSION=1.7.3 `

-    GIT_LOCATION=https://github.com/git-for-windows/git/releases/download/v2.10.1.windows.1/Git-2.10.1-64-bit.exe `

+    GIT_VERSION=2.10.2 `

     GOPATH=C:\go `

     FROM_DOCKERFILE=1

-WORKDIR C:\

-

 RUN `

-  setx /M Path $($Env:PATH+';C:\gcc\bin;C:\go\bin'); `

-  `

   $ErrorActionPreference = 'Stop'; `

+  $ProgressPreference = 'SilentlyContinue'; `

+  `

+  Function Test-Nano() { `

+    $EditionId = (Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion' -Name 'EditionID').EditionId; `

+    return (($EditionId -eq 'ServerStandardNano') -or ($EditionId -eq 'ServerDataCenterNano') -or ($EditionId -eq 'NanoServer')); `

+  }`

+  `

   Function Download-File([string] $source, [string] $target) { `

-    $wc = New-Object net.webclient; $wc.Downloadfile($source, $target) `

+    if (Test-Nano) { `

+      $handler = New-Object System.Net.Http.HttpClientHandler; `

+      $client = New-Object System.Net.Http.HttpClient($handler); `

+      $client.Timeout = New-Object System.TimeSpan(0, 30, 0); `

+      $cancelTokenSource = [System.Threading.CancellationTokenSource]::new(); `

+      $responseMsg = $client.GetAsync([System.Uri]::new($source), $cancelTokenSource.Token); `

+      $responseMsg.Wait(); `

+      if (!$responseMsg.IsCanceled) { `

+        $response = $responseMsg.Result; `

+        if ($response.IsSuccessStatusCode) { `

+          $downloadedFileStream = [System.IO.FileStream]::new($target, [System.IO.FileMode]::Create, [System.IO.FileAccess]::Write); `

+          $copyStreamOp = $response.Content.CopyToAsync($downloadedFileStream); `

+          $copyStreamOp.Wait(); `

+          $downloadedFileStream.Close(); `

+          if ($copyStreamOp.Exception -ne $null) { throw $copyStreamOp.Exception } `

+        } `

+      } else { `

+      Throw ("Failed to download " + $source) `

+      }`

+    } else { `

+      $webClient = New-Object System.Net.WebClient; `

+      $webClient.DownloadFile($source, $target); `

+    } `

   } `

   `

+  setx /M PATH $('C:\git\bin;C:\git\usr\bin;'+$Env:PATH+';C:\gcc\bin;C:\go\bin'); `

+  `

   Write-Host INFO: Downloading git...; `

-  Download-File $Env:GIT_LOCATION gitsetup.exe; `

+  $location='https://github.com/git-for-windows/git/releases/download/v'+$env:GIT_VERSION+'.windows.1/PortableGit-'+$env:GIT_VERSION+'-64-bit.7z.exe'; `

+  Download-File $location C:\gitsetup.7z.exe; `

   `

   Write-Host INFO: Downloading go...; `

-  Download-File $('https://golang.org/dl/go'+$Env:GO_VERSION+'.windows-amd64.zip') go.zip; `

+  Download-File $('https://golang.org/dl/go'+$Env:GO_VERSION+'.windows-amd64.zip') C:\go.zip; `

   `

   Write-Host INFO: Downloading compiler 1 of 3...; `

-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip gcc.zip; `

+  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `

   `

   Write-Host INFO: Downloading compiler 2 of 3...; `

-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/runtime.zip runtime.zip; `

+  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/runtime.zip C:\runtime.zip; `

   `

   Write-Host INFO: Downloading compiler 3 of 3...; `

-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/binutils.zip binutils.zip; `

+  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/binutils.zip C:\binutils.zip; `

   `

-  Write-Host INFO: Installing git...; `

-  $installPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall'; `

-  $installItem = 'Git_is1'; `

-  New-Item -Path $installPath -Name $installItem -Force; `

-  $installKey = $installPath+'\'+$installItem; `

-  New-ItemProperty $installKey -Name 'Inno Setup CodeFile: Path Option' -Value 'CmdTools' -PropertyType 'String' -Force; `

-  New-ItemProperty $installKey -Name 'Inno Setup CodeFile: Bash Terminal Option' -Value 'ConHost' -PropertyType 'String' -Force; `

-  New-ItemProperty $installKey -Name 'Inno Setup CodeFile: CRLF Option' -Value 'CRLFCommitAsIs' -PropertyType 'String' -Force; `

-  Start-Process gitsetup.exe -ArgumentList '/VERYSILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS /DIR=C:\git\' -Wait; `

+  Write-Host INFO: Installing PS7Zip package...; `

+  Install-Package PS7Zip -Force | Out-Null; `

+  Write-Host INFO: Importing PS7Zip...; `

+  Import-Module PS7Zip -Force; `

+  New-Item C:\git -ItemType Directory | Out-Null ; `

+  cd C:\git; `

+  Write-Host INFO: Extracting git...; `

+  Expand-7Zip C:\gitsetup.7z.exe | Out-Null; `

+  cd C:\; `

   `

   Write-Host INFO: Expanding go...; `

   Expand-Archive C:\go.zip -DestinationPath C:\; `

   `

-  Write-Host INFO: Expanding compiler...; `

+  Write-Host INFO: Expanding compiler 1 of 3...; `

   Expand-Archive C:\gcc.zip -DestinationPath C:\gcc -Force; `

+  Write-Host INFO: Expanding compiler 2 of 3...; `

   Expand-Archive C:\runtime.zip -DestinationPath C:\gcc -Force; `

+  Write-Host INFO: Expanding compiler 3 of 3...; `

   Expand-Archive C:\binutils.zip -DestinationPath C:\gcc -Force; `

   `

+  Write-Host INFO: Removing downloaded files...; `

+  Remove-Item C:\gcc.zip; `

+  Remove-Item C:\runtime.zip; `

+  Remove-Item C:\binutils.zip; `

+  Remove-Item C:\gitsetup.7z.exe; `

+  `

+  Write-Host INFO: Creating source directory...; `

+  New-Item -ItemType Directory -Path C:\go\src\github.com\docker\docker | Out-Null; `

+  `

+  Write-Host INFO: Configuring git core.autocrlf...; `

+  C:\git\bin\git config --global core.autocrlf true; `

+  `

   Write-Host INFO: Completed

-# Prepare for building

-COPY . C:\go\src\github.com\docker\docker

+# Make PowerShell the default entrypoint

+ENTRYPOINT ["powershell.exe"]

+

+# Set the working directory to the location of the sources

+WORKDIR C:\go\src\github.com\docker\docker

+# Copy the sources into the container

+COPY . .

@@ -32,17 +32,17 @@ type copyBackend interface {

 // stateBackend includes functions to implement to provide container state lifecycle functionality.

 type stateBackend interface {

-	ContainerCreate(config types.ContainerCreateConfig, validateHostname bool) (container.ContainerCreateCreatedBody, error)

+	ContainerCreate(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)

 	ContainerKill(name string, sig uint64) error

 	ContainerPause(name string) error

 	ContainerRename(oldName, newName string) error

 	ContainerResize(name string, height, width int) error

 	ContainerRestart(name string, seconds *int) error

 	ContainerRm(name string, config *types.ContainerRmConfig) error

-	ContainerStart(name string, hostConfig *container.HostConfig, validateHostname bool, checkpoint string, checkpointDir string) error

+	ContainerStart(name string, hostConfig *container.HostConfig, checkpoint string, checkpointDir string) error

 	ContainerStop(name string, seconds *int) error

 	ContainerUnpause(name string) error

-	ContainerUpdate(name string, hostConfig *container.HostConfig, validateHostname bool) (container.ContainerUpdateOKBody, error)

+	ContainerUpdate(name string, hostConfig *container.HostConfig) (container.ContainerUpdateOKBody, error)

 	ContainerWait(name string, timeout time.Duration) (int, error)

 }

@@ -156,8 +156,7 @@ func (s *containerRouter) postContainersStart(ctx context.Context, w http.Respon

 	checkpoint := r.Form.Get("checkpoint")

 	checkpointDir := r.Form.Get("checkpoint-dir")

-	validateHostname := versions.GreaterThanOrEqualTo(version, "1.24")

-	if err := s.backend.ContainerStart(vars["name"], hostConfig, validateHostname, checkpoint, checkpointDir); err != nil {

+	if err := s.backend.ContainerStart(vars["name"], hostConfig, checkpoint, checkpointDir); err != nil {

 		return err

 	}

@@ -332,7 +331,6 @@ func (s *containerRouter) postContainerUpdate(ctx context.Context, w http.Respon

 		return err

 	}

-	version := httputils.VersionFromContext(ctx)

 	var updateConfig container.UpdateConfig

 	decoder := json.NewDecoder(r.Body)

@@ -346,8 +344,7 @@ func (s *containerRouter) postContainerUpdate(ctx context.Context, w http.Respon

 	}

 	name := vars["name"]

-	validateHostname := versions.GreaterThanOrEqualTo(version, "1.24")

-	resp, err := s.backend.ContainerUpdate(name, hostConfig, validateHostname)

+	resp, err := s.backend.ContainerUpdate(name, hostConfig)

 	if err != nil {

 		return err

 	}

@@ -372,14 +369,13 @@ func (s *containerRouter) postContainersCreate(ctx context.Context, w http.Respo

 	version := httputils.VersionFromContext(ctx)

 	adjustCPUShares := versions.LessThan(version, "1.19")

-	validateHostname := versions.GreaterThanOrEqualTo(version, "1.24")

 	ccr, err := s.backend.ContainerCreate(types.ContainerCreateConfig{

 		Name:             name,

 		Config:           config,

 		HostConfig:       hostConfig,

 		NetworkingConfig: networkingConfig,

 		AdjustCPUShares:  adjustCPUShares,

-	}, validateHostname)

+	})

 	if err != nil {

 		return err

 	}

@@ -116,7 +116,7 @@ type Backend interface {

 	// ContainerAttachRaw attaches to container.

 	ContainerAttachRaw(cID string, stdin io.ReadCloser, stdout, stderr io.Writer, stream bool) error

 	// ContainerCreate creates a new Docker container and returns potential warnings

-	ContainerCreate(config types.ContainerCreateConfig, validateHostname bool) (container.ContainerCreateCreatedBody, error)

+	ContainerCreate(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)

 	// ContainerRm removes a container specified by `id`.

 	ContainerRm(name string, config *types.ContainerRmConfig) error

 	// Commit creates a new Docker image from an existing Docker container.

@@ -124,7 +124,7 @@ type Backend interface {

 	// ContainerKill stops the container execution abruptly.

 	ContainerKill(containerID string, sig uint64) error

 	// ContainerStart starts a new container

-	ContainerStart(containerID string, hostConfig *container.HostConfig, validateHostname bool, checkpoint string, checkpointDir string) error

+	ContainerStart(containerID string, hostConfig *container.HostConfig, checkpoint string, checkpointDir string) error

 	// ContainerWait stops processing until the given container is stopped.

 	ContainerWait(containerID string, timeout time.Duration) (int, error)

 	// ContainerUpdateCmdOnBuild updates container.Path and container.Args

@@ -307,7 +307,7 @@ func workdir(b *Builder, args []string, attributes map[string]bool, original str

 		return nil

 	}

-	container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig}, true)

+	container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig})

 	if err != nil {

 		return err

 	}

@@ -180,7 +180,7 @@ func (b *Builder) runContextCommand(args []string, allowRemote bool, allowLocalD

 		return nil

 	}

-	container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig}, true)

+	container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig})

 	if err != nil {

 		return err

 	}

@@ -496,7 +496,7 @@ func (b *Builder) create() (string, error) {

 	c, err := b.docker.ContainerCreate(types.ContainerCreateConfig{

 		Config:     b.runConfig,

 		HostConfig: hostConfig,

-	}, true)

+	})

 	if err != nil {

 		return "", err

 	}

@@ -537,7 +537,7 @@ func (b *Builder) run(cID string) (err error) {

 		}

 	}()

-	if err := b.docker.ContainerStart(cID, nil, true, "", ""); err != nil {

+	if err := b.docker.ContainerStart(cID, nil, "", ""); err != nil {

 		close(finished)

 		if cancelErr := <-cancelErrCh; cancelErr != nil {

 			logrus.Debugf("Build cancelled (%v) and got an error from ContainerStart: %v",

@@ -176,17 +176,10 @@ func Parse(rwc io.Reader, d *Directive) (*Node, error) {

 				newline := scanner.Text()

 				currentLine++

-				// If escape followed by a comment line then stop

-				// Note here that comment line starts with `#` at

-				// the first pos of the line

-				if stripComments(newline) == "" {

-					break

+				if stripComments(strings.TrimSpace(newline)) == "" {

+					continue

 				}

-				// If escape followed by an empty line then stop

-				if strings.TrimSpace(newline) == "" {

-					break

-				}

 				line, child, err = ParseLine(line+newline, d, false)

 				if err != nil {

 					return nil, err

@@ -150,8 +150,8 @@ func TestLineInformation(t *testing.T) {

 		t.Fatalf("Error parsing dockerfile %s: %v", testFileLineInfo, err)

 	}

-	if ast.StartLine != 5 || ast.EndLine != 27 {

-		fmt.Fprintf(os.Stderr, "Wrong root line information: expected(%d-%d), actual(%d-%d)\n", 5, 27, ast.StartLine, ast.EndLine)

+	if ast.StartLine != 5 || ast.EndLine != 31 {

+		fmt.Fprintf(os.Stderr, "Wrong root line information: expected(%d-%d), actual(%d-%d)\n", 5, 31, ast.StartLine, ast.EndLine)

 		t.Fatalf("Root line information doesn't match result.")

 	}

 	if len(ast.Children) != 3 {

@@ -161,7 +161,7 @@ func TestLineInformation(t *testing.T) {

 	expected := [][]int{

 		{5, 5},

 		{11, 12},

-		{17, 27},

+		{17, 31},

 	}

 	for i, child := range ast.Children {

 		if child.StartLine != expected[i][0] || child.EndLine != expected[i][1] {

@@ -16,11 +16,15 @@ ENV GOPATH \

 # Install the packages we need, clean up after them and us

 RUN apt-get update \

 	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean \

+

+

     && apt-get install -y --no-install-recommends git golang ca-certificates \

     && apt-get clean \

     && rm -rf /var/lib/apt/lists \

+

 	&& go get -v github.com/brimstone/consuldock \

     && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock \

+

 	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \

 	&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \

 	&& rm /tmp/dpkg.* \

@@ -16,8 +16,10 @@ RUN apt-get update \

     && apt-get install -y --no-install-recommends git golang ca-certificates \

     && apt-get clean \

     && rm -rf /var/lib/apt/lists \

+

 	&& go get -v github.com/brimstone/consuldock \

     && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock \

+

 	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \

 	&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \

 	&& rm /tmp/dpkg.* \

@@ -23,12 +23,14 @@ RUN apt-get update \

     && apt-get install -y --no-install-recommends unzip wget \

     && apt-get clean \

     && rm -rf /var/lib/apt/lists \

+

     && cd /tmp \

     && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip \

        -O web_ui.zip \

     && unzip web_ui.zip \

     && mv dist /webui \

     && rm web_ui.zip \

+

 	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \

 	&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \

 	&& rm /tmp/dpkg.*

@@ -40,8 +42,10 @@ RUN apt-get update \

     && apt-get install -y --no-install-recommends git golang ca-certificates build-essential \

     && apt-get clean \

     && rm -rf /var/lib/apt/lists \

+

 	&& go get -v github.com/hashicorp/consul \

 	&& mv $GOPATH/bin/consul /usr/bin/consul \

+

 	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \

 	&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \

 	&& rm /tmp/dpkg.* \

@@ -27,5 +27,8 @@ bye\

 frog

 RUN echo hello \

-# this is a comment that breaks escape continuation

-RUN echo this is some more useful stuff

+# this is a comment

+

+# this is a comment with a blank line surrounding it

+

+this is some more useful stuff

@@ -6,5 +6,4 @@

 (run "echo hi   world  goodnight")

 (run "echo goodbyefrog")

 (run "echo goodbyefrog")

-(run "echo hello")

-(run "echo this is some more useful stuff")

+(run "echo hello this is some more useful stuff")

deleted file mode 100644

@@ -1,15 +0,0 @@

-FROM busybox

-

-# The following will create two instructions

-# `Run foo`

-# `bar`

-# because empty line will break the escape.

-# The parser will generate the following:

-# (from "busybox")

-# (run "foo")

-# (bar "")

-# And `bar` will return an error instruction later

-# Note: Parse() will not immediately error out.

-RUN foo \

-

-bar

deleted file mode 100644

@@ -1,3 +0,0 @@

-(from "busybox")

-(run "foo")

-(bar "")

@@ -6,7 +6,9 @@ RUN apt-get \update && \

 ADD \conf\\" /.znc

 RUN foo \

+

 bar \

+

 baz

 CMD [ "\/usr\\\"/bin/znc", "-f", "-r" ]

@@ -7,6 +7,7 @@ import (

 	"github.com/docker/docker/cli"

 	"github.com/docker/docker/cli/command"

+	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/pkg/stringutils"

 	"github.com/spf13/cobra"

 	"golang.org/x/net/context"

@@ -43,17 +44,19 @@ func runList(dockerCli *command.DockerCli, opts listOptions) error {

 	}

 	w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0)

-	fmt.Fprintf(w, "NAME \tTAG \tDESCRIPTION\tENABLED")

+	fmt.Fprintf(w, "ID \tNAME \tTAG \tDESCRIPTION\tENABLED")

 	fmt.Fprintf(w, "\n")

 	for _, p := range plugins {

+		id := p.ID

 		desc := strings.Replace(p.Config.Description, "\n", " ", -1)

 		desc = strings.Replace(desc, "\r", " ", -1)

 		if !opts.noTrunc {

+			id = stringid.TruncateID(p.ID)

 			desc = stringutils.Ellipsis(desc, 45)

 		}

-		fmt.Fprintf(w, "%s\t%s\t%s\t%v\n", p.Name, p.Tag, desc, p.Enabled)

+		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%v\n", id, p.Name, p.Tag, desc, p.Enabled)

 	}

 	w.Flush()

 	return nil

@@ -45,7 +45,7 @@ func NewInspectCommand(dockerCli *command.DockerCli) *cobra.Command {

 func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {

 	var elementSearcher inspect.GetRefFunc

 	switch opts.inspectType {

-	case "", "container", "image", "node", "network", "service", "volume", "task":

+	case "", "container", "image", "node", "network", "service", "volume", "task", "plugin":

 		elementSearcher = inspectAll(context.Background(), dockerCli, opts.size, opts.inspectType)

 	default:

 		return fmt.Errorf("%q is not a valid value for --type", opts.inspectType)

@@ -95,6 +95,12 @@ func inspectVolume(ctx context.Context, dockerCli *command.DockerCli) inspect.Ge

 	}

 }

+func inspectPlugin(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc {

+	return func(ref string) (interface{}, []byte, error) {

+		return dockerCli.Client().PluginInspectWithRaw(ctx, ref)

+	}

+}

+

 func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool, typeConstraint string) inspect.GetRefFunc {

 	var inspectAutodetect = []struct {

 		ObjectType      string

@@ -108,6 +114,7 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,

 		{"service", false, inspectService(ctx, dockerCli)},

 		{"task", false, inspectTasks(ctx, dockerCli)},

 		{"node", false, inspectNode(ctx, dockerCli)},

+		{"plugin", false, inspectPlugin(ctx, dockerCli)},

 	}

 	isErrNotSwarmManager := func(err error) bool {

@@ -255,3 +255,24 @@ func IsErrSecretNotFound(err error) bool {

 	_, ok := err.(secretNotFoundError)

 	return ok

 }

+

+// pluginNotFoundError implements an error returned when a plugin is not in the docker host.

+type pluginNotFoundError struct {

+	name string

+}

+

+// NotFound indicates that this error type is of NotFound

+func (e pluginNotFoundError) NotFound() bool {

+	return true

+}

+

+// Error returns a string representation of a pluginNotFoundError

+func (e pluginNotFoundError) Error() string {

+	return fmt.Sprintf("Error: No such plugin: %s", e.name)

+}

+

+// IsErrPluginNotFound returns true if the error is caused

+// when a plugin is not found in the docker host.

+func IsErrPluginNotFound(err error) bool {

+	return IsErrNotFound(err)

+}

@@ -4,6 +4,7 @@ import (

 	"bytes"

 	"encoding/json"

 	"io/ioutil"

+	"net/http"

 	"github.com/docker/docker/api/types"

 	"golang.org/x/net/context"

@@ -13,6 +14,9 @@ import (

 func (cli *Client) PluginInspectWithRaw(ctx context.Context, name string) (*types.Plugin, []byte, error) {

 	resp, err := cli.get(ctx, "/plugins/"+name, nil, nil)

 	if err != nil {

+		if resp.statusCode == http.StatusNotFound {

+			return nil, nil, pluginNotFoundError{name}

+		}

 		return nil, nil, err

 	}

@@ -28,8 +28,8 @@ type Backend interface {

 	FindNetwork(idName string) (libnetwork.Network, error)

 	SetupIngress(req clustertypes.NetworkCreateRequest, nodeIP string) error

 	PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error

-	CreateManagedContainer(config types.ContainerCreateConfig, validateHostname bool) (container.ContainerCreateCreatedBody, error)

-	ContainerStart(name string, hostConfig *container.HostConfig, validateHostname bool, checkpoint string, checkpointDir string) error

+	CreateManagedContainer(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)

+	ContainerStart(name string, hostConfig *container.HostConfig, checkpoint string, checkpointDir string) error

 	ContainerStop(name string, seconds *int) error

 	ContainerLogs(context.Context, string, *backend.ContainerLogsConfig, chan struct{}) error

 	ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error

@@ -11,12 +11,10 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/distribution/digest"

-	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/events"

-	"github.com/docker/docker/api/types/versions"

 	"github.com/docker/docker/daemon/cluster/convert"

 	executorpkg "github.com/docker/docker/daemon/cluster/executor"

 	"github.com/docker/docker/reference"

@@ -215,8 +213,6 @@ func (c *containerAdapter) waitForDetach(ctx context.Context) error {

 func (c *containerAdapter) create(ctx context.Context) error {

 	var cr containertypes.ContainerCreateCreatedBody

 	var err error

-	version := httputils.VersionFromContext(ctx)

-	validateHostname := versions.GreaterThanOrEqualTo(version, "1.24")

 	if cr, err = c.backend.CreateManagedContainer(types.ContainerCreateConfig{

 		Name:       c.container.name(),

@@ -224,7 +220,7 @@ func (c *containerAdapter) create(ctx context.Context) error {

 		HostConfig: c.container.hostConfig(),

 		// Use the first network in container create

 		NetworkingConfig: c.container.createNetworkingConfig(),

-	}, validateHostname); err != nil {

+	}); err != nil {

 		return err

 	}

@@ -263,9 +259,7 @@ func (c *containerAdapter) create(ctx context.Context) error {

 }

 func (c *containerAdapter) start(ctx context.Context) error {

-	version := httputils.VersionFromContext(ctx)

-	validateHostname := versions.GreaterThanOrEqualTo(version, "1.24")

-	return c.backend.ContainerStart(c.container.name(), nil, validateHostname, "", "")

+	return c.backend.ContainerStart(c.container.name(), nil, "", "")

 }

 func (c *containerAdapter) inspect(ctx context.Context) (types.ContainerJSON, error) {

@@ -3,7 +3,6 @@ package daemon

 import (

 	"fmt"

 	"path/filepath"

-	"regexp"

 	"time"

 	"github.com/docker/docker/api/errors"

@@ -204,7 +203,7 @@ func (daemon *Daemon) setHostConfig(container *container.Container, hostConfig *

 // verifyContainerSettings performs validation of the hostconfig and config

 // structures.

-func (daemon *Daemon) verifyContainerSettings(hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool, validateHostname bool) ([]string, error) {

+func (daemon *Daemon) verifyContainerSettings(hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool) ([]string, error) {

 	// First perform verification of settings common across all platforms.

 	if config != nil {

@@ -222,18 +221,6 @@ func (daemon *Daemon) verifyContainerSettings(hostConfig *containertypes.HostCon

 			}

 		}

-		// Validate if the given hostname is RFC 1123 (https://tools.ietf.org/html/rfc1123) compliant.

-		if validateHostname && len(config.Hostname) > 0 {

-			// RFC1123 specifies that 63 bytes is the maximium length

-			// Windows has the limitation of 63 bytes in length

-			// Linux hostname is limited to HOST_NAME_MAX=64, not including the terminating null byte.

-			// We limit the length to 63 bytes here to match RFC1035 and RFC1123.

-			matched, _ := regexp.MatchString("^(([[:alnum:]]|[[:alnum:]][[:alnum:]\\-]*[[:alnum:]])\\.)*([[:alnum:]]|[[:alnum:]][[:alnum:]\\-]*[[:alnum:]])$", config.Hostname)

-			if len(config.Hostname) > 63 || !matched {

-				return nil, fmt.Errorf("invalid hostname format: %s", config.Hostname)

-			}

-		}

-

 		// Validate if Env contains empty variable or not (e.g., ``, `=foo`)

 		for _, env := range config.Env {

 			if _, err := opts.ValidateEnv(env); err != nil {

@@ -25,22 +25,22 @@ import (

 )

 // CreateManagedContainer creates a container that is managed by a Service

-func (daemon *Daemon) CreateManagedContainer(params types.ContainerCreateConfig, validateHostname bool) (containertypes.ContainerCreateCreatedBody, error) {

-	return daemon.containerCreate(params, true, validateHostname)

+func (daemon *Daemon) CreateManagedContainer(params types.ContainerCreateConfig) (containertypes.ContainerCreateCreatedBody, error) {

+	return daemon.containerCreate(params, true)

 }

 // ContainerCreate creates a regular container

-func (daemon *Daemon) ContainerCreate(params types.ContainerCreateConfig, validateHostname bool) (containertypes.ContainerCreateCreatedBody, error) {

-	return daemon.containerCreate(params, false, validateHostname)

+func (daemon *Daemon) ContainerCreate(params types.ContainerCreateConfig) (containertypes.ContainerCreateCreatedBody, error) {

+	return daemon.containerCreate(params, false)

 }

-func (daemon *Daemon) containerCreate(params types.ContainerCreateConfig, managed bool, validateHostname bool) (containertypes.ContainerCreateCreatedBody, error) {

+func (daemon *Daemon) containerCreate(params types.ContainerCreateConfig, managed bool) (containertypes.ContainerCreateCreatedBody, error) {

 	start := time.Now()

 	if params.Config == nil {

 		return containertypes.ContainerCreateCreatedBody{}, fmt.Errorf("Config cannot be empty in order to create a container")

 	}

-	warnings, err := daemon.verifyContainerSettings(params.HostConfig, params.Config, false, validateHostname)

+	warnings, err := daemon.verifyContainerSettings(params.HostConfig, params.Config, false)

 	if err != nil {

 		return containertypes.ContainerCreateCreatedBody{Warnings: warnings}, err

 	}

@@ -19,7 +19,7 @@ import (

 )

 // ContainerStart starts a container.

-func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.HostConfig, validateHostname bool, checkpoint string, checkpointDir string) error {

+func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.HostConfig, checkpoint string, checkpointDir string) error {

 	if checkpoint != "" && !daemon.HasExperimental() {

 		return apierrors.NewBadRequestError(fmt.Errorf("checkpoint is only supported in experimental mode"))

 	}

@@ -73,7 +73,7 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.Hos

 	// check if hostConfig is in line with the current system settings.

 	// It may happen cgroups are umounted or the like.

-	if _, err = daemon.verifyContainerSettings(container.HostConfig, nil, false, validateHostname); err != nil {

+	if _, err = daemon.verifyContainerSettings(container.HostConfig, nil, false); err != nil {

 		return err

 	}

 	// Adapt for old containers in case we have updates in this function and

@@ -7,10 +7,10 @@ import (

 )

 // ContainerUpdate updates configuration of the container

-func (daemon *Daemon) ContainerUpdate(name string, hostConfig *container.HostConfig, validateHostname bool) (container.ContainerUpdateOKBody, error) {

+func (daemon *Daemon) ContainerUpdate(name string, hostConfig *container.HostConfig) (container.ContainerUpdateOKBody, error) {

 	var warnings []string

-	warnings, err := daemon.verifyContainerSettings(hostConfig, nil, true, validateHostname)

+	warnings, err := daemon.verifyContainerSettings(hostConfig, nil, true)

 	if err != nil {

 		return container.ContainerUpdateOKBody{Warnings: warnings}, err

 	}

@@ -3962,8 +3962,9 @@ List nodes

 **Status codes**:

-- **200** – no error

-- **500** – server error

+-   **200** – no error

+-   **406** - node is not part of a swarm

+-   **500** – server error

 #### Inspect a node

@@ -4045,6 +4046,7 @@ Return low-level information on the node `id`

 -   **200** – no error

 -   **404** – no such node

+-   **406** – node is not part of a swarm

 -   **500** – server error

 #### Remove a node

@@ -4073,6 +4075,7 @@ Remove a node from the swarm.

 -   **200** – no error

 -   **404** – no such node

+-   **406** – node is not part of a swarm 

 -   **500** – server error

 #### Update a node

@@ -4128,6 +4131,7 @@ JSON Parameters:

 -   **200** – no error

 -   **404** – no such node

+-   **406** – node is not part of a swarm

 -   **500** – server error

 ### 3.8 Swarm

@@ -4178,7 +4182,9 @@ Inspect swarm

 **Status codes**:

-- **200** - no error

+-   **200** - no error

+-   **406** – node is not part of a swarm

+-   **500** - sever error

 #### Initialize a new swarm

@@ -4216,9 +4222,10 @@ Initialize a new swarm. The body of the HTTP response includes the node ID.

 **Status codes**:

-- **200** – no error

-- **400** – bad parameter

-- **406** – node is already part of a swarm

+-   **200** – no error

+-   **400** – bad parameter

+-   **406** – node is already part of a swarm

+-   **500** - server error

 JSON Parameters: