README.md

-# My Retina Windows Templates for Packer
+# Windows Templates for Packer
 
 [![Build status](https://ci.appveyor.com/api/projects/status/76pea1oexae5ca05?svg=true)](https://ci.appveyor.com/project/StefanScherer/packer-windows)
 
@@ -16,16 +16,15 @@ Some of my enhancements are:
 
 * Support of fullscreen Retina display on a MacBook Pro.
 * WinRM, no more OpenSSH
-* PowerShell attached to taskbar in desktop editions
 
 ### Packer Version
 
-[Packer](https://github.com/mitchellh/packer/blob/master/CHANGELOG.md) `1.1.3` is recommended.
+[Packer](https://github.com/mitchellh/packer/blob/master/CHANGELOG.md) `1.3.3` is recommended.
 
 ### Windows Versions
 
 The following Windows versions are known to work (built with VMware Fusion Pro
-10.1.1):
+11.0.2):
 
 * Windows 10
   * Windows 10 1809 -> Vagrant Cloud box [StefanScherer/windows_10](https://app.vagrantup.com/StefanScherer/boxes/windows_10)

answer_files/2019_core/Autounattend.xml

@@ -66,7 +66,7 @@
                         Windows Server Insider product key
                         See https://blogs.windows.com/windowsexperience/2017/07/13/announcing-windows-server-insider-preview-build-16237/
                     -->
-                    <!-- <Key>6XBNX-4JQGW-QX6QG-74P76-72V67</Key> -->
+                    <!--<Key></Key>-->
                     <WillShowUI>OnError</WillShowUI>
                 </ProductKey>
                 <AcceptEula>true</AcceptEula>
@@ -163,14 +163,15 @@
                     <Description>Disable password expiration for vagrant user</Description>
                 </SynchronousCommand>
                 <!-- WITHOUT WINDOWS UPDATES -->
+                <!--
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\enable-winrm.ps1</CommandLine>
                     <Description>Enable WinRM</Description>
                     <Order>99</Order>
                 </SynchronousCommand>
+                -->
                 <!-- END WITHOUT WINDOWS UPDATES -->
                 <!-- WITH WINDOWS UPDATES -->
-                <!--
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c a:\microsoft-updates.bat</CommandLine>
                     <Order>98</Order>
@@ -188,7 +189,6 @@
                     <Order>100</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
-                -->
                 <!-- END WITH WINDOWS UPDATES -->
             </FirstLogonCommands>
             <OOBE>

answer_files/server_insider/Autounattend.xml

@@ -51,7 +51,7 @@
                     <InstallFrom>
                         <MetaData wcm:action="add">
                             <Key>/IMAGE/NAME</Key>
-                            <Value>Windows Server 2016 SERVERDATACENTERACORE</Value>
+                            <Value>Windows Server 2019 SERVERDATACENTERACORE</Value>
                         </MetaData>
                     </InstallFrom>
                     <InstallTo>

appveyor.yml

@@ -3,7 +3,7 @@ image: Visual Studio 2017
 
 install:
   - choco feature disable --name showDownloadProgress
-  - choco install -y packer -source bin
+  - choco install -y packer
   - ps: Install-WindowsFeature Hyper-V-PowerShell
 
 build_script:

build_windows_10_insider.sh

 #!/bin/bash
-packer build --only=vmware-iso --var iso_url=~/Downloads/Windows10_InsiderPreview_Client_x64_en-us_18272.iso windows_10_insider.json
+packer build --only=vmware-iso --var iso_url=~/packer_cache/insider/Windows10_InsiderPreview_Client_x64_en-us_18290.iso windows_10_insider.json
 

build_windows_2019_docker.ps1

+if (Test-Path ./output-hyperv-iso) {
+  Remove-Item -Recurse -Force ./output-hyperv-iso
+}
+
+packer build --only=hyperv-iso `
+             --var iso_url=./iso/en_windows_server_2019_x64_dvd_4cb967d8.iso `
+             --var iso_checksum="4C5DD63EFEE50117986A2E38D4B3A3FBAF3C1C15E2E7EA1D23EF9D8AF148DD2D" `
+             windows_2019_docker.json

build_windows_2019_docker.sh

@@ -3,6 +3,7 @@
 packer build \
   --only=vmware-iso \
   --var vhv_enable=true \
-  --var iso_url=~/downloads/17763.1.180914-1434.rs5_release_SERVER_EVAL_x64FRE_en-us.iso \
-  --var "docker_images=mcr.microsoft.com/nanoserver:sac2019 mcr.microsoft.com/windowsservercore:ltsc2019 mcr.microsoft.com/windows:ltsc2019" \
+  --var autounattend=./tmp/2019_core/Autounattend.xml \
+  --var iso_url=~/packer_cache/msdn/en_windows_server_2019_x64_dvd_4cb967d8.iso \
+  --var iso_checksum="4C5DD63EFEE50117986A2E38D4B3A3FBAF3C1C15E2E7EA1D23EF9D8AF148DD2D" \
   windows_2019_docker.json

build_windows_server_insider_docker.sh

@@ -4,5 +4,5 @@
 PACKER_LOG=debug packer build \
   --only=vmware-iso \
   --var vhv_enable=true \
-  --var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_17623.iso \
+  --var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_en-us_18346.iso \
   windows_server_insider_docker.json

scripts/docker/install-docker.ps1

+# use docker_provider:  "ee", "ce", "master" or ""
 $docker_provider = "ee"
-$docker_version = "18-09-0"
+$docker_version = "18-09-3"
 if (Test-Path env:docker_provider) {
   $docker_provider = $env:docker_provider  
 }
@@ -9,25 +10,23 @@ if (Test-Path env:docker_version) {
 
 $ProgressPreference = 'SilentlyContinue'
 if ($docker_provider -eq "ce") {
-  Set-ExecutionPolicy Bypass -scope Process
-  New-Item -Type Directory -Path "$($env:ProgramFiles)\docker"
-  Write-Output "Downloading docker $docker_version ..."
-  wget -outfile $env:TEMP\docker.zip $("https://download.docker.com/win/static/edge/x86_64/docker-{0}-ce.zip" -f $docker_version)
-  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
-  [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$($env:ProgramFiles)\docker", [EnvironmentVariableTarget]::Machine)
-  $env:Path = $env:Path + ";$($env:ProgramFiles)\docker"
-  Write-Output "Registering docker service ..."
-  . dockerd --register-service
+  $zip_url = $("https://download.docker.com/win/static/edge/x86_64/docker-{0}-ce.zip" -f $docker_version)
 } elseif ($docker_provider -eq "ee") {
+  $zip_url = $("https://dockermsft.blob.core.windows.net/dockercontainer/docker-{0}.zip" -f $docker_version)
+} elseif ($docker_provider -eq "master") {
+  $docker_version = "master"
+  $zip_url = "https://master.dockerproject.com/windows/x86_64/docker.zip"
+}
+
+if ($zip_url) {
   Set-ExecutionPolicy Bypass -scope Process
   New-Item -Type Directory -Path "$($env:ProgramFiles)\docker"
   Write-Output "Downloading docker $docker_version ..."
-  wget -outfile $env:TEMP\docker.zip $("https://dockermsft.blob.core.windows.net/dockercontainer/docker-{0}.zip" -f $docker_version)
+  wget -outfile $env:TEMP\docker.zip $zip_url
   Expand-Archive -Path $env:TEMP\docker.zip -DestinationPath $env:TEMP -Force
   copy $env:TEMP\docker\*.* $env:ProgramFiles\docker
   Remove-Item $env:TEMP\docker.zip
+  Remove-Item -Recurse $env:TEMP\docker
   [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$($env:ProgramFiles)\docker", [EnvironmentVariableTarget]::Machine)
   $env:Path = $env:Path + ";$($env:ProgramFiles)\docker"
   Write-Output "Registering docker service ..."

scripts/vm-guest-tools.bat

@@ -18,7 +18,7 @@ if exist "C:\Users\vagrant\windows.iso" (
 )
 
 if not exist "C:\Windows\Temp\windows.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://softwareupdate.vmware.com/cds/vmw-desktop/ws/15.0.1/10737736/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://softwareupdate.vmware.com/cds/vmw-desktop/ws/15.0.2/10952284/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
     cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\vmware-tools.tar -oC:\Windows\Temp"
     FOR /r "C:\Windows\Temp" %%a in (VMware-tools-windows-*.iso) DO REN "%%~a" "windows.iso"
     rd /S /Q "C:\Program Files (x86)\VMWare"
@@ -27,8 +27,8 @@ if not exist "C:\Windows\Temp\windows.iso" (
 cmd /c ""C:\Program Files\7-Zip\7z.exe" x "C:\Windows\Temp\windows.iso" -oC:\Windows\Temp\VMWare"
 cmd /c C:\Windows\Temp\VMWare\setup.exe /S /v"/qn REBOOT=R\"
 
-rd /Q "C:\Windows\Temp\vmware-tools.tar"
-rd /Q "C:\Windows\Temp\windows.iso"
+del /Q "C:\Windows\Temp\vmware-tools.tar"
+del /Q "C:\Windows\Temp\windows.iso"
 rd /S /Q "C:\Windows\Temp\VMware"
 goto :done
 
@@ -39,7 +39,7 @@ if exist "C:\Users\vagrant\VBoxGuestAdditions.iso" (
 )
 
 if not exist "C:\Windows\Temp\VBoxGuestAdditions.iso" (
-    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://download.virtualbox.org/virtualbox/5.2.22/VBoxGuestAdditions_5.2.22.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
+    powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://download.virtualbox.org/virtualbox/5.2.26/VBoxGuestAdditions_5.2.26.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
 )
 
 cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\VBoxGuestAdditions.iso -oC:\Windows\Temp\virtualbox"

scripts/win-updates.ps1

@@ -64,7 +64,7 @@ function Install-WindowsUpdates() {
     $CurrentUpdates = $SearchResult.Updates
     while($script:i -lt $CurrentUpdates.Count -and $script:CycleUpdateCount -lt $MaxUpdatesPerCycle) {
         $Update = $CurrentUpdates.Item($script:i)
-        if (($null -ne $Update) -and (!$Update.IsDownloaded)) {
+        if ($null -ne $Update) {
             [bool]$addThisUpdate = $false
             if ($Update.InstallationBehavior.CanRequestUserInput) {
                 LogWrite "> Skipping: $($Update.Title) because it requires user input"
@@ -165,13 +165,7 @@ function Install-WindowsUpdates() {
 function Check-WindowsUpdates() {
     LogWrite "Checking For Windows Updates"
     $Username = $env:USERDOMAIN + "\" + $env:USERNAME
-
-    New-EventLog -Source $ScriptName -LogName 'Windows Powershell' -ErrorAction SilentlyContinue
-
-    $Message = "Script: " + $ScriptPath + "`nScript User: " + $Username + "`nStarted: " + (Get-Date).toString()
-
-    Write-EventLog -LogName 'Windows Powershell' -Source $ScriptName -EventID "104" -EntryType "Information" -Message $Message
-    LogWrite $Message
+    LogWrite "Script: " + $ScriptPath + "`nScript User: " + $Username + "`nStarted: " + (Get-Date).toString()
 
     $script:UpdateSearcher = $script:UpdateSession.CreateUpdateSearcher()
     $script:successful = $FALSE

vagrantfile-windows_10.template

@@ -64,6 +64,6 @@ Vagrant.configure("2") do |config|
     config.vm.provider "hyperv" do |v|
         v.cpus = 2
         v.maxmemory = 2048
-        v.differencing_disk = true
+        v.linked_clone = true
     end
 end

vagrantfile-windows_2016.template

@@ -43,7 +43,7 @@ Vagrant.configure("2") do |config|
         v.vmx["sound.startconnected"] = "FALSE"
         v.vmx["sound.present"] = "FALSE"
         v.vmx["sound.autodetect"] = "TRUE"
-        v.vms["virtualhw.version"] = "11"
+        v.vmx["virtualhw.version"] = "14"
         v.enable_vmrun_ip_lookup = false
         v.whitelist_verified = true
         v.vmx["hgfs.linkRootShare"] = "FALSE"

vagrantfile-windows_2016_core.template

@@ -34,7 +34,7 @@ Vagrant.configure("2") do |config|
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
         v.vmx["scsi0.virtualDev"] = "lsisas1068"
-        v.vms["virtualhw.version"] = "11"
+        v.vmx["virtualhw.version"] = "14"
         v.enable_vmrun_ip_lookup = false
         v.whitelist_verified = true
         v.vmx["hgfs.linkRootShare"] = "FALSE"
@@ -56,6 +56,6 @@ Vagrant.configure("2") do |config|
     config.vm.provider "hyperv" do |v|
         v.cpus = 2
         v.maxmemory = 2048
-        v.differencing_disk = true
+        v.linked_clone = true
     end
 end

vagrantfile-windows_2019_core.template

+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.require_version ">= 1.6.2"
+
+Vagrant.configure("2") do |config|
+    config.vm.define "vagrant-windows-2019"
+    config.vm.box = "windows_2019"
+    config.vm.communicator = "winrm"
+
+    # Admin user name and password
+    config.winrm.username = "vagrant"
+    config.winrm.password = "vagrant"
+
+    config.vm.guest = :windows
+    config.windows.halt_timeout = 15
+
+    config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
+
+    config.vm.provider :virtualbox do |v, override|
+        v.gui = true
+        v.customize ["modifyvm", :id, "--memory", 2048]
+        v.customize ["modifyvm", :id, "--cpus", 2]
+        v.customize ["modifyvm", :id, "--vram", 128]
+        v.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
+        v.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
+    end
+
+    config.vm.provider :vmware_fusion do |v, override|
+        #v.gui = true
+        v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
+        v.vmx["ethernet0.virtualDev"] = "vmxnet3"
+        v.vmx["RemoteDisplay.vnc.enabled"] = "false"
+        v.vmx["RemoteDisplay.vnc.port"] = "5900"
+        v.vmx["scsi0.virtualDev"] = "lsisas1068"
+        v.vmx["virtualhw.version"] = "14"
+        v.enable_vmrun_ip_lookup = false
+        v.whitelist_verified = true
+        v.vmx["hgfs.linkRootShare"] = "FALSE"
+    end
+
+    config.vm.provider :vmware_workstation do |v, override|
+        #v.gui = true
+        v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
+        v.vmx["ethernet0.virtualDev"] = "vmxnet3"
+        v.vmx["RemoteDisplay.vnc.enabled"] = "false"
+        v.vmx["RemoteDisplay.vnc.port"] = "5900"
+        v.vmx["scsi0.virtualDev"] = "lsisas1068"
+        v.enable_vmrun_ip_lookup = false
+        v.whitelist_verified = true
+        v.vmx["hgfs.linkRootShare"] = "FALSE"
+    end
+
+    config.vm.provider "hyperv" do |v|
+        v.cpus = 2
+        v.maxmemory = 2048
+        v.linked_clone = true
+    end
+end

validate.sh

+#!/bin/bash
+
+for template in $(ls -1 *.json); do
+  echo $template
+  packer validate --only=vmware-iso --only=virtualbox-iso $template
+done

windows_10.json

@@ -33,6 +33,8 @@
       "boot_command": "",
       "boot_wait": "6m",
       "communicator": "winrm",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": "{{user `disk_size`}}",
       "disk_type_id": "{{user `disk_type_id`}}",
       "floppy_files": [
@@ -51,16 +53,14 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "vmware-iso",
-      "version": 12,
+      "version": 14,
       "vm_name": "windows_10",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -73,6 +73,7 @@
       "boot_command": "",
       "boot_wait": "6m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -91,22 +92,9 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "vm_name": "windows_10",
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",

windows_10_docker.json

-{
-  "builders": [
-    {
-      "boot_command": "",
-      "boot_wait": "5s",
-      "communicator": "winrm",
-      "headless": false,
-      "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-      "source_path": "{{user `source_path`}}",
-      "type": "vmware-vmx",
-      "vm_name": "windows_10_docker",
-      "vmx_data": {
-        "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
-      },
-      "vmx_remove_ethernet_interfaces": true,
-      "vnc_port_max": 5980,
-      "vnc_port_min": 5900,
-      "winrm_password": "vagrant",
-      "winrm_timeout": "15m",
-      "winrm_username": "vagrant"
-    }
-  ],
-  "post-processors": [
-    {
-      "keep_input_artifact": false,
-      "output": "windows_10_docker_{{.Provider}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "vagrantfile-windows_10.template"
-    }
-  ],
-  "provisioners": [
-    {
-      "scripts": [
-        "./scripts/docker/10/install-containers-feature.ps1"
-      ],
-      "type": "powershell"
-    },
-    {
-      "type": "windows-restart"
-    },
-    {
-      "environment_vars": [
-        "docker_images={{user `docker_images`}}",
-        "docker_provider={{user `docker_provider`}}",
-        "docker_version={{user `docker_version`}}"
-      ],
-      "scripts": [
-        "./scripts/docker/add-docker-group.ps1",
-        "./scripts/docker/install-docker.ps1",
-        "./scripts/docker/docker-pull.ps1",
-        "./scripts/docker/open-docker-insecure-port.ps1",
-        "./scripts/docker/open-docker-swarm-ports.ps1",
-        "./scripts/docker/remove-docker-key-json.ps1",
-        "./scripts/docker/disable-windows-defender.ps1"
-      ],
-      "type": "powershell"
-    },
-    {
-      "scripts": [
-        "./scripts/uac-enable.bat",
-        "./scripts/set-winrm-automatic.bat",
-        "./scripts/compact.bat"
-      ],
-      "type": "windows-shell"
-    }
-  ],
-  "variables": {
-    "docker_images": "microsoft/windowsservercore microsoft/nanoserver",
-    "docker_provider": "ce",
-    "docker_version": "17.10.0",
-    "source_path": "path-to.vmx"
-  }
-}
-

windows_10_insider.json

@@ -4,6 +4,8 @@
       "boot_command": "",
       "boot_wait": "6m",
       "communicator": "winrm",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -21,15 +23,13 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "vmware-iso",
-      "version": 12,
+      "version": 14,
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -42,6 +42,7 @@
       "boot_command": "",
       "boot_wait": "6m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -60,22 +61,9 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "winrm_password": "vagrant",
       "winrm_timeout": "2h",
       "winrm_username": "vagrant"
@@ -158,9 +146,9 @@
   "variables": {
     "autounattend": "./answer_files/10_insider/Autounattend.xml",
     "disk_size": "61440",
-    "iso_checksum": "ae1e3662acfb9435b0b611679c2843f0249a1dfa48033ae7e36df5619d1f592e",
+    "iso_checksum": "2b913368e4b18460755d1cf591ead881278a725c99541a10df899437cce0e119",
     "iso_checksum_type": "sha256",
-    "iso_url": "https://software-download.microsoft.com/db/Windows10_InsiderPreview_Client_x64_en-us_18272.iso",
+    "iso_url": "https://software-download.microsoft.com/db/Windows10_InsiderPreview_EnterpriseVL_x64_en-us_18343.iso",
     "manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewadvanced"
   }
 }

windows_2008_r2.json

@@ -2,6 +2,8 @@
   "builders": [
     {
       "boot_wait": "2m",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": 131072,
       "floppy_files": [
         "./answer_files/2008_r2/Autounattend.xml",
@@ -15,6 +17,7 @@
       "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
       "iso_checksum_type": "md5",
       "iso_url": "https://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
@@ -23,10 +26,7 @@
       "type": "vmware-iso",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -34,6 +34,7 @@
     },
     {
       "boot_wait": "2m",
+      "cpus": 2,
       "disk_size": 131072,
       "floppy_files": [
         "./answer_files/2008_r2/Autounattend.xml",
@@ -47,25 +48,12 @@
       "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
       "iso_checksum_type": "md5",
       "iso_url": "https://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
       "ssh_wait_timeout": "6h",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ]
+      "type": "virtualbox-iso"
     }
   ],
   "post-processors": [

windows_2008_r2_core.json

@@ -2,6 +2,8 @@
   "builders": [
     {
       "boot_wait": "2m",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/2008_r2_core/Autounattend.xml",
@@ -13,6 +15,7 @@
       "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
       "iso_checksum_type": "md5",
       "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
@@ -21,10 +24,7 @@
       "type": "vmware-iso",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -32,6 +32,7 @@
     },
     {
       "boot_wait": "2m",
+      "cpus": 2,
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/2008_r2_core/Autounattend.xml",
@@ -43,25 +44,12 @@
       "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
       "iso_checksum_type": "md5",
       "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
       "ssh_wait_timeout": "2h",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ]
+      "type": "virtualbox-iso"
     }
   ],
   "post-processors": [

windows_2012.json

@@ -2,6 +2,8 @@
   "builders": [
     {
       "boot_wait": "2m",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/2012/Autounattend.xml",
@@ -14,6 +16,7 @@
       "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
       "iso_checksum_type": "md5",
       "iso_url": "https://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
@@ -22,10 +25,7 @@
       "type": "vmware-iso",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -33,6 +33,7 @@
     },
     {
       "boot_wait": "2m",
+      "cpus": 2,
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/2012/Autounattend.xml",
@@ -45,25 +46,12 @@
       "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
       "iso_checksum_type": "md5",
       "iso_url": "https://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
       "ssh_wait_timeout": "2h",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ]
+      "type": "virtualbox-iso"
     }
   ],
   "post-processors": [

windows_2012_r2.json

@@ -33,6 +33,8 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -47,16 +49,14 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "skip_compaction": true,
       "type": "vmware-iso",
       "vm_name": "windows_2012_r2",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -68,6 +68,7 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -83,22 +84,9 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "vm_name": "windows_2012_r2",
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",

windows_2012_r2_core.json

@@ -33,6 +33,8 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -46,14 +48,12 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "vmware-iso",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -65,6 +65,7 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -79,22 +80,9 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",
       "winrm_username": "vagrant"

windows_2012_r2_hyperv.json

@@ -2,6 +2,8 @@
   "builders": [
     {
       "boot_wait": "2m",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/2012_r2_hyperv/Autounattend.xml",
@@ -14,6 +16,7 @@
       "iso_checksum": "9c9e0d82cb6301a4b88fd2f4c35caf80",
       "iso_checksum_type": "md5",
       "iso_url": "http://care.dlservice.microsoft.com/dl/download/F/7/D/F7DF966B-5C40-4674-9A32-D83D869A3244/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVERHYPERCORE_EN-US-IRM_SHV_X64FRE_EN-US_DV5.ISO",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
@@ -22,10 +25,7 @@
       "type": "vmware-iso",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -33,6 +33,7 @@
     },
     {
       "boot_wait": "2m",
+      "cpus": 2,
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/2012_r2_hyperv/Autounattend.xml",
@@ -45,25 +46,12 @@
       "iso_checksum": "9c9e0d82cb6301a4b88fd2f4c35caf80",
       "iso_checksum_type": "md5",
       "iso_url": "http://care.dlservice.microsoft.com/dl/download/F/7/D/F7DF966B-5C40-4674-9A32-D83D869A3244/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVERHYPERCORE_EN-US-IRM_SHV_X64FRE_EN-US_DV5.ISO",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
       "ssh_wait_timeout": "6h",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ]
+      "type": "virtualbox-iso"
     }
   ],
   "post-processors": [

windows_2016.json

@@ -33,6 +33,8 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": "{{user `disk_size`}}",
       "disk_type_id": "{{user `disk_type_id`}}",
       "floppy_files": [
@@ -50,16 +52,14 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",
       "type": "vmware-iso",
-      "version": 12,
+      "version": 14,
       "vm_name": "WindowsServer2016",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -71,6 +71,7 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -88,22 +89,9 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "vm_name": "WindowsServer2016",
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",
@@ -174,15 +162,9 @@
     "hyperv_switchname": "{{env `hyperv_switchname`}}",
     "iso_checksum": "70721288BBCDFE3239D8F8C0FAE55F1F",
     "iso_checksum_type": "md5",
-<<<<<<< HEAD
-    "iso_url": "http://care.dlservice.microsoft.com/dl/download/1/4/9/149D5452-9B29-4274-B6B3-5361DBDA30BC/14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO",
-    "restart_timeout": "15m",
-    "winrm_timeout": "6h"
-=======
     "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
     "restart_timeout": "5m",
     "winrm_timeout": "4h"
->>>>>>> 8a04a65c6b7c6e511d085db3b3f3bfe5437edfad
   }
 }
 

windows_2016_ami.json

@@ -3,6 +3,7 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -14,29 +15,16 @@
         "./scripts/unattend.xml",
         "./scripts/sysprep.bat"
       ],
+      "format": "ova",
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows2016_64",
       "headless": "{{user `headless`}}",
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "a:/sysprep.bat",
-      "format": "ova",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "vm_name": "WindowsServer2016",
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",
@@ -51,19 +39,20 @@
       "vagrantfile_template": "vagrantfile-windows_2016.template"
     },
     {
-      "type": "amazon-import",
-      "only": ["virtualbox-iso"],
       "access_key": "",
-      "secret_key": "",
-      "region": "",
       "ami_name": "packer_windows_2016",
-      "s3_bucket_name": "{{user `aws_s3_bucket_name`}}",
       "keep_input_artifact": false,
       "license_type": "BYOL",
-      "tags": 
-      {
+      "only": [
+        "virtualbox-iso"
+      ],
+      "region": "",
+      "s3_bucket_name": "{{user `aws_s3_bucket_name`}}",
+      "secret_key": "",
+      "tags": {
         "Description": "packer-windows 2016 amazon-import {{timestamp}}"
-      }
+      },
+      "type": "amazon-import"
     }
   ],
   "provisioners": [
@@ -99,6 +88,7 @@
   ],
   "variables": {
     "autounattend": "./answer_files/2016/Autounattend.xml",
+    "aws_s3_bucket_name": "{{env `AWS_S3_BUCKET`}}",
     "disk_size": "61440",
     "disk_type_id": "1",
     "headless": "false",
@@ -106,8 +96,7 @@
     "iso_checksum_type": "md5",
     "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
     "restart_timeout": "5m",
-    "winrm_timeout": "4h",
-    "aws_s3_bucket_name": "{{env `AWS_S3_BUCKET`}}"
+    "winrm_timeout": "4h"
   }
 }
 

windows_2016_core.json

@@ -30,6 +30,8 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": "{{user `disk_size`}}",
       "disk_type_id": "{{user `disk_type_id`}}",
       "floppy_files": [
@@ -45,14 +47,12 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "vmware-iso",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -64,6 +64,7 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -79,22 +80,9 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",
       "winrm_username": "vagrant"

windows_2016_core_ami.json

@@ -3,6 +3,7 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -12,29 +13,16 @@
         "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1"
       ],
+      "format": "ova",
       "guest_additions_mode": "disable",
       "guest_os_type": "Windows2016_64",
       "headless": "{{user `headless`}}",
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
-      "format": "ova",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",
       "winrm_username": "vagrant"
@@ -48,19 +36,20 @@
       "vagrantfile_template": "vagrantfile-windows_2016_core.template"
     },
     {
-      "type": "amazon-import",
-      "only": ["virtualbox-iso"],
       "access_key": "",
-      "secret_key": "",
-      "region": "",
       "ami_name": "packer_windows_2016_core",
-      "s3_bucket_name": "{{user `aws_s3_bucket_name`}}",
       "keep_input_artifact": false,
       "license_type": "BYOL",
-      "tags": 
-      {
+      "only": [
+        "virtualbox-iso"
+      ],
+      "region": "",
+      "s3_bucket_name": "{{user `aws_s3_bucket_name`}}",
+      "secret_key": "",
+      "tags": {
         "Description": "packer-windows 2016 core amazon-import {{timestamp}}"
-      }
+      },
+      "type": "amazon-import"
     }
   ],
   "provisioners": [
@@ -85,18 +74,25 @@
         "./scripts/compact.bat"
       ],
       "type": "windows-shell"
+    },
+    {
+      "inline": [
+        "C:/ProgramData/Amazon/EC2-Windows/Launch/Scripts/InitializeInstance.ps1 -Schedule",
+        "C:/ProgramData/Amazon/EC2-Windows/Launch/Scripts/SysprepInstance.ps1 -NoShutdown"
+      ],
+      "type": "powershell"
     }
   ],
   "variables": {
     "autounattend": "./answer_files/2016_core/Autounattend.xml",
+    "aws_s3_bucket_name": "{{env `AWS_S3_BUCKET`}}",
     "disk_size": "61440",
     "disk_type_id": "1",
     "headless": "false",
     "iso_checksum": "70721288BBCDFE3239D8F8C0FAE55F1F",
     "iso_checksum_type": "md5",
     "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
-    "winrm_timeout": "6h",
-    "aws_s3_bucket_name": "{{env `AWS_S3_BUCKET`}}"
+    "winrm_timeout": "6h"
   }
 }
 

windows_2016_dc.json

@@ -30,6 +30,8 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": "{{user `disk_size`}}",
       "disk_type_id": "{{user `disk_type_id`}}",
       "floppy_files": [
@@ -45,15 +47,13 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "vmware-iso",
       "vm_name": "windows_2016_dc",
       "vmx_data": {
         "RemoteDisplay.vnc.enabled": "false",
-        "RemoteDisplay.vnc.port": "5900",
-        "memsize": "2048",
-        "numvcpus": "2",
-        "scsi0.virtualDev": "lsisas1068"
+        "RemoteDisplay.vnc.port": "5900"
       },
       "vmx_remove_ethernet_interfaces": true,
       "vnc_port_max": 5980,
@@ -65,6 +65,7 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
       "disk_size": "{{user `disk_size`}}",
       "floppy_files": [
         "{{user `autounattend`}}",
@@ -80,22 +81,9 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_url": "{{user `iso_url`}}",
+      "memory": 2048,
       "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
       "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "2048"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "2"
-        ]
-      ],
       "vm_name": "windows_2016_dc",
       "winrm_password": "vagrant",
       "winrm_timeout": "{{user `winrm_timeout`}}",

windows_2016_docker.json

@@ -32,6 +32,8 @@
     {
       "boot_wait": "2m",
       "communicator": "winrm",
+      "cpus": 2,
+      "disk_adapter_type": "lsisas1068",
       "disk_size": "{{user `disk_size`}}",
       "disk_type_id": "{{user `disk_type_id`}}",
       "floppy_files": [
@@ -48,16 +50,14 @@
       "iso_checksum": "{{user `iso_checksum`}}",