Commit 6f3cdccf authored by Bob Tanner's avatar Bob Tanner

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

parents d76e55fa 4115bff5
......@@ -3,13 +3,15 @@
if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto 64BIT
%windir%\microsoft.net\framework\v4.0.30319\ngen.exe update /force /queue
%windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems
%windir%\microsoft.net\framework\v4.0.30319\ngen.exe update /force /queue > NUL
%windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems > NUL
exit /b
exit 0
:64BIT
%windir%\microsoft.net\framework\v4.0.30319\ngen.exe update /force /queue
%windir%\microsoft.net\framework64\v4.0.30319\ngen.exe update /force /queue
%windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems
%windir%\microsoft.net\framework64\v4.0.30319\ngen.exe executequeueditems
\ No newline at end of file
%windir%\microsoft.net\framework\v4.0.30319\ngen.exe update /force /queue > NUL
%windir%\microsoft.net\framework64\v4.0.30319\ngen.exe update /force /queue > NUL
%windir%\microsoft.net\framework\v4.0.30319\ngen.exe executequeueditems > NUL
%windir%\microsoft.net\framework64\v4.0.30319\ngen.exe executequeueditems > NUL
exit 0
. sc.exe config winrm start= delayed-auto
......@@ -153,6 +153,7 @@
"remote_path": "/tmp/script.bat",
"scripts": [
"./scripts/pin-powershell.bat",
"./scripts/compile-dotnet-assemblies.bat",
"./scripts/set-winrm-automatic.bat",
"./scripts/uac-enable.bat",
"./scripts/dis-updates.bat",
......
......@@ -91,14 +91,14 @@
"enable_secure_boot": true,
"enable_virtualization_extensions": true,
"generation": 2,
"secondary_iso_images": [
"./iso/windows_10_insider_unattend.iso"
],
"guest_additions_mode": "disable",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_url": "{{user `iso_url`}}",
"ram_size": 2048,
"secondary_iso_images": [
"./iso/windows_10_insider_unattend.iso"
],
"shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
"switch_name": "{{user `hyperv_switchname`}}",
"type": "hyperv-iso",
......
......@@ -150,9 +150,9 @@
"disk_size": "61440",
"disk_type_id": "1",
"headless": "false",
"iso_checksum": "ca1108d5be2c091bfb57e8f3db3be1e8baa9c32802131f7a6e43e63f7b596591",
"iso_checksum": "03b97d09b0c19ac6c424c5b41a9b4781cb7334d7ef1158199a9693f7dcecce9f",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/pr/en_windows_server_version_1709_x64_dvd_100090904.iso",
"iso_url": "https://download.my.visualstudio.com/db/en_windows_server_version_1709_updated_jan_2018_x64_dvd_100492040.iso",
"manually_download_iso_from": "https://my.visualstudio.com/downloads?pid=2347",
"restart_timeout": "5m",
"vhv_enable": "false",
......
......@@ -131,7 +131,7 @@
{
"scripts": [
"./scripts/docker/2016/install-containers-feature.ps1",
"./scripts/docker/set-winrm-automatic.ps1"
"./scripts/docker/set-winrm-delayed-automatic.ps1"
],
"type": "powershell"
},
......@@ -146,6 +146,7 @@
"docker_version={{user `docker_version`}}"
],
"scripts": [
"./scripts/docker/set-winrm-automatic.ps1",
"./scripts/docker/add-docker-group.ps1",
"./scripts/docker/install-docker.ps1",
"./scripts/docker/docker-pull.ps1",
......@@ -176,12 +177,12 @@
"docker_provider": "DockerProvider",
"docker_version": "17.10.0-ee-preview-3",
"headless": "false",
"iso_checksum": "ca1108d5be2c091bfb57e8f3db3be1e8baa9c32802131f7a6e43e63f7b596591",
"iso_checksum": "03b97d09b0c19ac6c424c5b41a9b4781cb7334d7ef1158199a9693f7dcecce9f",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/pr/en_windows_server_version_1709_x64_dvd_100090904.iso",
"iso_url": "https://download.my.visualstudio.com/db/en_windows_server_version_1709_updated_jan_2018_x64_dvd_100492040.iso",
"manually_download_iso_from": "https://my.visualstudio.com/downloads?pid=2347",
"restart_timeout": "5m",
"vhv_enable": "false",
"vhv_enable": "true",
"winrm_timeout": "2h"
}
}
......
......@@ -117,7 +117,8 @@
},
{
"scripts": [
"./scripts/docker/2016/install-containers-feature.ps1"
"./scripts/docker/2016/install-containers-feature.ps1",
"./scripts/docker/set-winrm-delayed-automatic.ps1"
],
"type": "powershell"
},
......@@ -132,6 +133,7 @@
"docker_version={{user `docker_version`}}"
],
"scripts": [
"./scripts/docker/set-winrm-automatic.ps1",
"./scripts/docker/add-docker-group.ps1",
"./scripts/docker/install-docker.ps1",
"./scripts/docker/docker-pull.ps1",
......@@ -156,7 +158,7 @@
"iso_url": "https://software-download.microsoft.com/pr/Windows_InsiderPreview_Server_17093.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"restart_timeout": "5m",
"vhv_enable": "false",
"vhv_enable": "true",
"winrm_timeout": "4h"
}
}
......
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