Commit c4332677 authored by Bob Tanner's avatar Bob Tanner

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

parents 46ff3e31 9a4d6c00
......@@ -3,5 +3,5 @@
packer build \
--only=vmware-iso \
--var vhv_enable=true \
--var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_vNext_en-us_17677.iso \
--var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_vNext_en-us_17744.iso \
windows_2019.json
......@@ -3,7 +3,6 @@
packer build \
--only=vmware-iso \
--var vhv_enable=true \
--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" \
--var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_vNext_en-us_17744.iso \
--var "docker_images=mcr.microsoft.com/nanoserver-insider:10.0.17744.1001 mcr.microsoft.com/windowsservercore-insider:10.0.17744.1001 mcr.microsoft.com/windows-insider:10.0.17744.1001" \
windows_2019_docker.json
$docker_provider = "ee"
$docker_version = "18-03-1-ee-2"
$docker_version = "18-03-1-ee-3"
if (Test-Path env:docker_provider) {
$docker_provider = $env:docker_provider
}
......
......@@ -172,7 +172,7 @@
"disk_type_id": "1",
"docker_images": "microsoft/windowsservercore microsoft/nanoserver",
"docker_provider": "ee",
"docker_version": "18-03-1-ee-2",
"docker_version": "18-03-1-ee-3",
"headless": "false",
"iso_checksum": "70721288BBCDFE3239D8F8C0FAE55F1F",
"iso_checksum_type": "md5",
......
......@@ -156,9 +156,9 @@
"disk_type_id": "1",
"headless": "false",
"hyperv_switchname": "{{env `hyperv_switchname`}}",
"iso_checksum": "a26740774eb9787c8363deac08c301317268d2bf8444e4d48540181eac112bbc",
"iso_checksum": "4dae6fed7bbb9a30a4e1453020bbaa39e88f37a2962bdf7bb81705cd9318f695",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17733.iso",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17744.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"restart_timeout": "5m",
"winrm_timeout": "2h"
......
......@@ -138,9 +138,9 @@
"disk_size": "61440",
"disk_type_id": "1",
"headless": "false",
"iso_checksum": "a26740774eb9787c8363deac08c301317268d2bf8444e4d48540181eac112bbc",
"iso_checksum": "4dae6fed7bbb9a30a4e1453020bbaa39e88f37a2962bdf7bb81705cd9318f695",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17733.iso",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17744.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"winrm_timeout": "6h"
}
......
......@@ -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.17733.1000 mcr.microsoft.com/windowsservercore-insider:10.0.17733.1000 mcr.microsoft.com/windows-insider:10.0.17733.1000",
"docker_images": "mcr.microsoft.com/nanoserver-insider:10.0.17744.1001 mcr.microsoft.com/windowsservercore-insider:10.0.17744.1001 mcr.microsoft.com/windows-insider:10.0.17744.1001",
"docker_provider": "ee",
"docker_version": "18-03-1-ee-2",
"docker_version": "18-03-1-ee-3",
"headless": "false",
"iso_checksum": "a26740774eb9787c8363deac08c301317268d2bf8444e4d48540181eac112bbc",
"iso_checksum": "4dae6fed7bbb9a30a4e1453020bbaa39e88f37a2962bdf7bb81705cd9318f695",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17733.iso",
"iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17744.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"restart_timeout": "5m",
"vhv_enable": "false",
......
......@@ -175,7 +175,7 @@
"disk_type_id": "1",
"docker_images": "microsoft/windowsservercore:1709 microsoft/nanoserver:1709",
"docker_provider": "ee",
"docker_version": "18-03-1-ee-2",
"docker_version": "18-03-1-ee-3",
"headless": "false",
"iso_checksum": "03b97d09b0c19ac6c424c5b41a9b4781cb7334d7ef1158199a9693f7dcecce9f",
"iso_checksum_type": "sha256",
......
......@@ -175,7 +175,7 @@
"disk_type_id": "1",
"docker_images": "microsoft/windowsservercore:1803 microsoft/nanoserver:1803",
"docker_provider": "ee",
"docker_version": "18-03-1-ee-2",
"docker_version": "18-03-1-ee-3",
"headless": "false",
"iso_checksum": "1f396b448ae0a68e5a2f694b0afabb61498e20a5df38c874aacb4e940a661b61",
"iso_checksum_type": "sha256",
......
......@@ -151,7 +151,7 @@
"disk_type_id": "1",
"docker_images": "microsoft/nanoserver-insider microsoft/windowsservercore-insider",
"docker_provider": "ee",
"docker_version": "18-03-1-ee-2",
"docker_version": "18-03-1-ee-3",
"headless": "false",
"iso_checksum": "a4a8349a356d2d04219f417973d2a7576b35ab754cd30ad647d5e89d20890122",
"iso_checksum_type": "sha256",
......
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