Commit f2ad7697 authored by Patrick Lang's avatar Patrick Lang

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

parents 6a251578 ee9814cb
......@@ -4,8 +4,8 @@
# packer build --only=vmware-iso --var iso_url=~/packer_cache/connect/17035.1000.171103-1616.rs_prerelease_SERVER_ACORE_VOL_x64FRE_en-us.iso --var iso_checksum=dd412bd5c7d29fa5166a10f4cb36dacf7fcb605a5b8e8a6e8fa87e13aed6851d --var iso_checksum_type=sha256 --var autounattend=./tmp/2016_connect/Autounattend.xml windows_server_insider_docker.json
# Windows Insider ISO
packer build \
PACKER_LOG=debug packer build \
--only=vmware-iso \
--var vhv_enable=true \
--var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_17046.iso \
--var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_17074.iso \
windows_server_insider_docker.json
......@@ -34,6 +34,9 @@ Function SetupPhase1 {
Function SetupPhase2 {
Write-Host "Installing Vagrant plugins"
vagrant plugin install vagrant-reload
Write-Host "Adding NAT"
New-VMSwitch -SwitchName "packer-hyperv-iso" -SwitchType Internal
New-NetIPAddress -IPAddress 192.168.0.1 -PrefixLength 24 -InterfaceIndex (Get-NetAdapter -name "vEthernet (packer-hyperv-iso)").ifIndex
......
......@@ -11,7 +11,7 @@ function DockerPull {
}
Write-Host Installing $image ...
$j = Start-Job -ScriptBlock { docker pull $args[0] } -ArgumentList $image
$j = Start-Job -ScriptBlock { docker pull $args[0] } -ArgumentList "$image"
while ( $j.JobStateInfo.state -ne "Completed" -And $j.JobStateInfo.state -ne "Failed" ) {
Write-Host $j.JobStateInfo.state
Start-Sleep 30
......
......@@ -15,7 +15,7 @@ if exist "C:\Users\vagrant\windows.iso" (
)
if not exist "C:\Windows\Temp\windows.iso" (
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/14.1.0/7370693/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" <NUL
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://softwareupdate.vmware.com/cds/vmw-desktop/ws/14.1.1/7528167/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"
......
$procname="TiWorker"
$finished = 0
while ($finished -lt 3) {
Start-Sleep 30
Write-Output "Checking for $procname ($finished)"
$output = "$(get-process -erroraction silentlycontinue $procname)"
if ( $output -eq "") {
$finished = $finished + 1
} else {
$finished = 0
}
}
......@@ -45,6 +45,7 @@ Vagrant.configure("2") do |config|
v.vmx["sound.autodetect"] = "TRUE"
v.enable_vmrun_ip_lookup = false
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
config.vm.provider :vmware_workstation do |v, override|
......@@ -57,6 +58,7 @@ Vagrant.configure("2") do |config|
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|
......
......@@ -36,6 +36,7 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
config.vm.provider :vmware_workstation do |v, override|
......@@ -48,5 +49,6 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
end
......@@ -36,6 +36,7 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
config.vm.provider :vmware_workstation do |v, override|
......@@ -48,5 +49,6 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
end
......@@ -36,6 +36,7 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
config.vm.provider :vmware_workstation do |v, override|
......@@ -48,5 +49,6 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
end
......@@ -46,6 +46,7 @@ Vagrant.configure("2") do |config|
v.vms["virtualhw.version"] = "11"
v.enable_vmrun_ip_lookup = false
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
config.vm.provider :vmware_workstation do |v, override|
......@@ -58,5 +59,6 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.enable_vmrun_ip_lookup = false
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
end
......@@ -37,6 +37,7 @@ Vagrant.configure("2") do |config|
v.vms["virtualhw.version"] = "11"
v.enable_vmrun_ip_lookup = false
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
config.vm.provider :vmware_workstation do |v, override|
......@@ -49,6 +50,7 @@ Vagrant.configure("2") do |config|
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|
......
......@@ -36,6 +36,7 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
config.vm.provider :vmware_workstation do |v, override|
......@@ -48,5 +49,6 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
end
......@@ -36,6 +36,7 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
config.vm.provider :vmware_workstation do |v, override|
......@@ -48,5 +49,6 @@ Vagrant.configure("2") do |config|
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["gui.fitguestusingnativedisplayresolution"] = "FALSE"
v.whitelist_verified = true
v.vmx["hgfs.linkRootShare"] = "FALSE"
end
end
......@@ -147,6 +147,7 @@
"./scripts/docker/add-docker-group.ps1",
"./scripts/docker/install-docker.ps1",
"./scripts/docker/docker-pull.ps1",
"./scripts/wait-for-tiworker.ps1",
"./scripts/docker/open-docker-insecure-port.ps1",
"./scripts/docker/open-docker-swarm-ports.ps1",
"./scripts/docker/remove-docker-key-json.ps1",
......
......@@ -174,7 +174,7 @@
"disk_type_id": "1",
"docker_images": "microsoft/windowsservercore:1709 microsoft/nanoserver:1709",
"docker_provider": "DockerProvider",
"docker_version": "preview",
"docker_version": "17.10.0-ee-preview-3",
"headless": "false",
"iso_checksum": "ca1108d5be2c091bfb57e8f3db3be1e8baa9c32802131f7a6e43e63f7b596591",
"iso_checksum_type": "sha256",
......
......@@ -135,9 +135,9 @@
"disk_size": "61440",
"disk_type_id": "1",
"headless": "false",
"iso_checksum": "dd412bd5c7d29fa5166a10f4cb36dacf7fcb605a5b8e8a6e8fa87e13aed6851d",
"iso_checksum": "bcdabad84c7a7cc62706bc31ca24ac729da044b2c3290521b0d4eae632a8c382",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/sg/Windows_InsiderPreview_Server_17035.iso",
"iso_url": "https://software-download.microsoft.com/sg/Windows_InsiderPreview_Server_17074.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"restart_timeout": "5m",
"vhv_enable": "false",
......
......@@ -147,17 +147,17 @@
"autounattend": "./answer_files/server_insider/Autounattend.xml",
"disk_size": "61440",
"disk_type_id": "1",
"docker_images": "microsoft/windowsservercore-insider microsoft/nanoserver-insider",
"docker_images": "microsoft/nanoserver-insider microsoft/windowsservercore-insider",
"docker_provider": "DockerProvider",
"docker_version": "preview",
"docker_version": "17.10.0-ee-preview-3",
"headless": "false",
"iso_checksum": "dd412bd5c7d29fa5166a10f4cb36dacf7fcb605a5b8e8a6e8fa87e13aed6851d",
"iso_checksum": "bcdabad84c7a7cc62706bc31ca24ac729da044b2c3290521b0d4eae632a8c382",
"iso_checksum_type": "sha256",
"iso_url": "https://software-download.microsoft.com/sg/Windows_InsiderPreview_Server_17035.iso",
"iso_url": "https://software-download.microsoft.com/pr/Windows_InsiderPreview_Server_17074.iso",
"manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver",
"restart_timeout": "5m",
"vhv_enable": "false",
"winrm_timeout": "2h"
"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