Commit cac63418 authored by Bob Tanner's avatar Bob Tanner

Merge branch 'my' of https://github.com/StefanScherer/packer-windows into packer-builder-vsphere

parents a5226fac 15bb5896
......@@ -3,7 +3,7 @@
packer build \
--only=vmware-iso \
--var vhv_enable=true \
--var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_vNext_en-us_17723.iso \
--var iso_checksum=b3deca38ed2bd8f85ee05ed340b05357ac51fb2a2c2f6d467853f62d2cb93a17 \
--var "docker_images=mcr.microsoft.com/nanoserver-insider:10.0.17723.1000 mcr.microsoft.com/windowsservercore-insider:10.0.17723.1000 mcr.microsoft.com/windows-insider:10.0.17723.1000" \
--var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_vNext_en-us_17733.iso \
--var iso_checksum=a26740774eb9787c8363deac08c301317268d2bf8444e4d48540181eac112bbc \
--var "docker_images=mcr.microsoft.com/nanoserver-insider:10.0.17733.1000 mcr.microsoft.com/windowsservercore-insider:10.0.17733.1000 mcr.microsoft.com/windows-insider:10.0.17733.1000" \
windows_2019_docker.json
......@@ -39,11 +39,10 @@ if exist "C:\Users\vagrant\VBoxGuestAdditions.iso" (
)
if not exist "C:\Windows\Temp\VBoxGuestAdditions.iso" (
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.virtualbox.org/virtualbox/5.2.10/VBoxGuestAdditions_5.2.10.iso', 'C:\Windows\Temp\VBoxGuestAdditions.iso')" <NUL
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.virtualbox.org/virtualbox/5.2.16/VBoxGuestAdditions_5.2.16.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"
certutil -addstore -f "TrustedPublisher" C:\Windows\Temp\virtualbox\cert\vbox-sha256-r3.cer
certutil -addstore -f "TrustedPublisher" C:\Windows\Temp\virtualbox\cert\vbox-sha256.cer
certutil -addstore -f "TrustedPublisher" C:\Windows\Temp\virtualbox\cert\vbox-sha1.cer
cmd /c C:\Windows\Temp\virtualbox\VBoxWindowsAdditions.exe /S
......
......@@ -158,9 +158,9 @@
"variables": {
"autounattend": "./answer_files/10_insider/Autounattend.xml",
"disk_size": "61440",
"iso_checksum": "CA0715B5646FBD18376F9A370BB1A2DF8A94DDB3F1BF107843C357E7DAD417FF",
"iso_checksum": "c463a6fc4b43b1817170fd95e470946084b6d2293fc4bedfaab7d24bacb97151",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/pr/Windows10_InsiderPreview_EnterpriseVL_x64_en-us_16251.iso",
"iso_url": "https://software-download.microsoft.com/db/Windows10_InsiderPreview_Client_x64_en-us_17713.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewadvanced"
}
}
......
......@@ -74,7 +74,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -75,7 +75,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -81,7 +81,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -71,7 +71,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -156,9 +156,9 @@
"disk_type_id": "1",
"headless": "false",
"hyperv_switchname": "{{env `hyperv_switchname`}}",
"iso_checksum": "b3deca38ed2bd8f85ee05ed340b05357ac51fb2a2c2f6d467853f62d2cb93a17",
"iso_checksum": "a26740774eb9787c8363deac08c301317268d2bf8444e4d48540181eac112bbc",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17723.iso",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17733.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"restart_timeout": "5m",
"winrm_timeout": "2h"
......
......@@ -74,7 +74,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......@@ -138,9 +138,9 @@
"disk_size": "61440",
"disk_type_id": "1",
"headless": "false",
"iso_checksum": "b3deca38ed2bd8f85ee05ed340b05357ac51fb2a2c2f6d467853f62d2cb93a17",
"iso_checksum": "a26740774eb9787c8363deac08c301317268d2bf8444e4d48540181eac112bbc",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17723.iso",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17733.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"winrm_timeout": "6h"
}
......
......@@ -81,7 +81,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......@@ -170,13 +170,13 @@
"autounattend": "./answer_files/2019_core/Autounattend.xml",
"disk_size": "61440",
"disk_type_id": "1",
"docker_images": "mcr.microsoft.com/nanoserver-insider:10.0.17723.1000 mcr.microsoft.com/windowsservercore-insider:10.0.17723.1000 mcr.microsoft.com/windows-insider:10.0.17723.1000",
"docker_images": "mcr.microsoft.com/nanoserver-insider:10.0.17733.1000 mcr.microsoft.com/windowsservercore-insider:10.0.17733.1000 mcr.microsoft.com/windows-insider:10.0.17733.1000",
"docker_provider": "ee",
"docker_version": "18-03-1-ee-2",
"headless": "false",
"iso_checksum": "b3deca38ed2bd8f85ee05ed340b05357ac51fb2a2c2f6d467853f62d2cb93a17",
"iso_checksum": "a26740774eb9787c8363deac08c301317268d2bf8444e4d48540181eac112bbc",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17723.iso",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17733.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"restart_timeout": "5m",
"vhv_enable": "false",
......
......@@ -80,7 +80,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -84,7 +84,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -80,7 +80,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -84,7 +84,7 @@
"./scripts/win-updates.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -72,7 +72,7 @@
"./scripts/enable-winrm.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
......@@ -72,7 +72,7 @@
"./scripts/enable-winrm.ps1"
],
"guest_additions_mode": "disable",
"guest_os_type": "Windows2012_64",
"guest_os_type": "Windows2016_64",
"headless": "{{user `headless`}}",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment