Update to Windows 10 1607

windows10/README.md

@@ -1,9 +1,9 @@
-# Docker on Windows 10 Insider 14352
+# Docker on Windows 10
 
-This `Vagrantfile` installs Docker on Windows 10 Insider 14352 or newer
-as described in https://msdn.microsoft.com/de-de/virtualization/windowscontainers/quick_start/quick_start_windows_10
+This `Vagrantfile` installs Docker Engine on Windows 10 1607 or newer
+as described in https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10
 
-You need a Vagrant box with Windows 10 Insider 14352.
+You need a Vagrant box with Windows 10 1607.
 
 ```
 vagrant up

windows10/Vagrantfile

@@ -4,7 +4,7 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "windows_10_insider_14352"
+  config.vm.box = "windows_10"
   config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
 
   config.vm.communicator = "winrm"
@@ -21,9 +21,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", path: "scripts/install-container-feature.ps1", privileged: true
   config.vm.provision "shell", path: "scripts/enable-autologon.ps1", privileged: true
   config.vm.provision "reload"
-  config.vm.provision "shell", path: "scripts/install-docker.ps1", privileged: true
-  config.vm.provision "shell", path: "scripts/install-base-container-images.ps1", privileged: true, powershell_elevated_interactive: true
   config.vm.provision "shell", path: "scripts/add-docker-group.ps1", privileged: true
+  config.vm.provision "shell", path: "scripts/install-docker.ps1", privileged: true
   config.vm.provision "reload"
   config.vm.provision "shell", path: "../scripts/install-chocolatey.ps1", privileged: false
   config.vm.provision "shell", path: "../scripts/install-git.ps1", privileged: false

windows10/scripts/add-docker-group.ps1

@@ -1,7 +1,2 @@
 net localgroup docker /add
 net localgroup docker vagrant /add
-
-@{group="docker"} | ConvertTo-Json | Out-File -Encoding ascii C:\ProgramData\docker\config\daemon.json
-
-restart-service docker
-# logoff and logon again

windows10/scripts/install-docker.ps1

@@ -1,7 +1,19 @@
-# https://msdn.microsoft.com/de-de/virtualization/windowscontainers/quick_start/quick_start_windows_10
-New-Item -Type Directory -Path 'C:\Program Files\docker\'
-Invoke-WebRequest https://aka.ms/tp5/b/dockerd -OutFile $env:ProgramFiles\docker\dockerd.exe
-Invoke-WebRequest https://aka.ms/tp5/b/docker -OutFile $env:ProgramFiles\docker\docker.exe
-[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Program Files\Docker", [EnvironmentVariableTarget]::Machine)
-. 'C:\Program Files\docker\dockerd' --register-service
+# https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10
+Set-ExecutionPolicy Bypass -scope Process
+
+Set-ItemProperty -Path 'HKLM:SOFTWARE\Microsoft\Windows NT\CurrentVersion\Virtualization\Containers' -Name VSmbDisableOplocks -Type DWord -Value 1 -Force
+
+New-Item -Type Directory -Path "$($env:ProgramFiles)\docker"
+wget -outfile $env:TEMP\docker-1.12.0.zip https://get.docker.com/builds/Windows/x86_64/docker-1.12.0.zip
+Expand-Archive -Path $env:TEMP\docker-1.12.0.zip -DestinationPath $env:TEMP -Force
+copy $env:TEMP\docker\*.exe $env:ProgramFiles\docker
+Remove-Item $env:TEMP\docker-1.12.0.zip
+[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$($env:ProgramFiles)\docker", [EnvironmentVariableTarget]::Machine)
+$env:Path = $env:Path + ";$($env:ProgramFiles)\docker"
+. dockerd --register-service -H npipe:// -H 0.0.0.0:2375 -G docker
+
 Start-Service Docker
+
+Write-Host "Installing NanoServer docker image..."
+docker pull microsoft/nanoserver:10.0.14300.1030
+docker pull microsoft/nanoserver