Merge branch 'win10_16251' of https://github.com/PatrickLang/packer-windows into insider-hyperv

build_windows_2016_insider.sh

 #!/bin/bash
 
 # Microsoft Connect ISO
-# packer build --only=vmware-iso --var iso_url=~/packer_cache/connect/16237.1001.170701-0549.rs_prerelease_SERVER_ACORE_VOL_X64FRE_en-US.iso --var iso_checksum=674e275b0191bc1588c6b123eda372dd6c2d6c1b01ef63a70e86be2cc009b256 --var iso_checksum_type=sha256 --var autounattend=./tmp/2016_connect/Autounattend.xml windows_2016_insider.json
-packer build --only=vmware-iso --var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_2_16237.iso windows_2016_insider.json
+# packer build --only=vmware-iso --var iso_url=~/packer_cache/connect/16251.1000.170721-1512.rs_prerelease_SERVER_ACORE_VOL_X64FRE_en-US.iso --var iso_checksum=303073849054d28806600af6212fccdeabff5590190664a038b2693c17d537df --var iso_checksum_type=sha256 --var autounattend=./tmp/2016_connect/Autounattend.xml windows_2016_insider.json
+# packer build --only=vmware-iso --var iso_url=~/packer_cache/connect/16257.1000.170728-1630.rs_prerelease_SERVER_ACORE_VOL_X64FRE_en-US.iso --var iso_checksum=b988201b8019a272d67f5f6737f2180bfedcc2cf5b065aab7fbceb43eaa7d995 --var iso_checksum_type=sha256 --var autounattend=./tmp/2016_connect/Autounattend.xml windows_2016_insider.json
+packer build --only=vmware-iso --var iso_url=~/packer_cache/connect/16275.1000.170822-1423.rs3_release_SERVER_ACORE_VOL_x64FRE_en-us.iso --var iso_checksum=a0f7aa63991c086bdbcaafb5871005204eb90373020144b403d3231b52ca1d52 --var iso_checksum_type=sha256 --var autounattend=./tmp/2016_connect/Autounattend.xml windows_2016_insider.json
+# Windows Insider ISO
+#packer build --only=vmware-iso --var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_2_16237.iso windows_2016_insider.json

scripts/docker/10/install-docker.ps1

 Set-ExecutionPolicy Bypass -scope Process
 New-Item -Type Directory -Path "$($env:ProgramFiles)\docker"
 Write-Host "Downloading docker ..."
-wget -outfile $env:TEMP\docker.zip "https://download.docker.com/win/static/edge/x86_64/docker-17.06.0-ce.zip"
+wget -outfile $env:TEMP\docker.zip "https://download.docker.com/win/static/edge/x86_64/docker-17.06.1-ce.zip"
 Expand-Archive -Path $env:TEMP\docker.zip -DestinationPath $env:TEMP -Force
 copy $env:TEMP\docker\*.exe $env:ProgramFiles\docker
 Remove-Item $env:TEMP\docker.zip

scripts/docker/2016/install-docker.ps1

@@ -4,6 +4,6 @@ Write-Host "Install-Module ..."
 Install-Module -Name DockerMsftProviderInsider -Force
 Write-Host "Install-Package ..."
 Set-PSRepository -InstallationPolicy Trusted -Name PSGallery
-Install-Package -Name docker -ProviderName DockerMsftProviderInsider -Force -RequiredVersion 17.06.0-ce
+Install-Package -Name docker -ProviderName DockerMsftProviderInsider -Force
 Set-PSRepository -InstallationPolicy Untrusted -Name PSGallery
 Start-Service docker

scripts/docker/docker-pull-local.ps1

+#"Remove" | Out-File C:\Users\vagrant\Desktop\delete-me-to-continue.txt
+
+#while (Test-Path C:\Users\vagrant\Desktop\delete-me-to-continue.txt) {
+#  Start-Sleep 1
+#}
+
+Write-Host "Downloading nanoserver image"
+docker import http://172.16.63.1:8080/CBaseOs_rs3_release_16275.1000.170822-1423_amd64fre_NanoServer_en-us.tar.gz microsoft/nanoserver-insider:latest
+Write-Host "Downloading windowsservercore image"
+docker import http://172.16.63.1:8080/CBaseOs_rs3_release_16275.1000.170822-1423_amd64fre_ServerDatacenterCore_en-us.tar.gz microsoft/windowsservercore-insider:latest
+docker images

windows_10_insider.json

@@ -161,9 +161,9 @@
   ],
   "variables": {
     "manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewadvanced",
-    "iso_url": "https://software-download.microsoft.com/pr/Windows10_InsiderPreview_EnterpriseVL_x64_en-us_16232.iso",
-    "iso_checksum_type": "sha1",
-    "iso_checksum": "8e84a14b972a2d7643d347c57068b51e88e86ae5",
+    "iso_url": "https://software-download.microsoft.com/pr/Windows10_InsiderPreview_EnterpriseVL_x64_en-us_16251.iso",
+    "iso_checksum_type": "sha256",
+    "iso_checksum": "CA0715B5646FBD18376F9A370BB1A2DF8A94DDB3F1BF107843C357E7DAD417FF",
     "autounattend": "./answer_files/10_insider/Autounattend.xml",
     "disk_size": "61440"
   }

windows_2016_insider.json

@@ -116,7 +116,7 @@
       "scripts": [
         "./scripts/docker/add-docker-group.ps1",
         "./scripts/docker/2016/install-docker.ps1",
-        "./scripts/docker/docker-pull-insider-async.ps1",
+        "./scripts/docker/docker-pull-local.ps1",
         "./scripts/docker/open-docker-insecure-port.ps1",
         "./scripts/docker/remove-docker-key-json.ps1",
         "./scripts/docker/disable-windows-defender.ps1"
@@ -142,9 +142,10 @@
     }
   ],
   "variables": {
-    "iso_url": "https://software-download.microsoft.com/pr/Windows_InsiderPreview_Server_16257.iso",
+    "manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
+    "iso_url": "https://software-download.microsoft.com/pr/Windows_InsiderPreview_Server_16267.iso",
     "iso_checksum_type": "sha256",
-    "iso_checksum": "B988201B8019A272D67F5F6737F2180BFEDCC2CF5B065AAB7FBCEB43EAA7D995",
+    "iso_checksum": "1FA3EEED8555DD6E120727A7DB6B47B2987357B7001F6B5AF2A732A12CB61EC3",
     "autounattend": "./answer_files/2016_insider/Autounattend.xml"
   }
 }