diff --git a/answer_files/2016_insider/Autounattend.xml b/answer_files/server_insider/Autounattend.xml similarity index 100% rename from answer_files/2016_insider/Autounattend.xml rename to answer_files/server_insider/Autounattend.xml diff --git a/build_windows_2016_insider.sh b/build_windows_2016_insider.sh deleted file mode 100755 index 99d978a6fa16d1f4f0d9c8ca600b320efcca9b84..0000000000000000000000000000000000000000 --- a/build_windows_2016_insider.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# Microsoft Connect ISO -# packer build --only=vmware-iso --var iso_url=~/packer_cache/connect/16278.1000.170825-1441.rs3_release_SERVER_ACORE_VOL_x64FRE_en-us.iso --var iso_checksum=f87ebde2f4dc7094d2e01819d370cb8d06d2bcde520d3bdf9e8ce7e70a8ea5da --var iso_checksum_type=sha256 --var autounattend=./tmp/2016_connect/Autounattend.xml windows_2016_insider.json -# Windows Insider ISO -packer build --only=vmware-iso --var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_16278.iso windows_2016_insider.json diff --git a/build_windows_server_insider_docker.sh b/build_windows_server_insider_docker.sh new file mode 100755 index 0000000000000000000000000000000000000000..12ab2d24b37c059219d66e6cb3dfb24b6e2302f3 --- /dev/null +++ b/build_windows_server_insider_docker.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# Microsoft Connect ISO +# 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 \ + --only=vmware-iso \ + --var disk_type_id=3 \ + --var disk_size=30720 \ + --var vhv_enable=true \ + --var iso_url=~/packer_cache/insider/Windows_InsiderPreview_Server_17035.iso \ + windows_server_insider_docker.json diff --git a/scripts/docker/docker-pull-insider-async.ps1 b/scripts/docker/docker-pull-insider-async.ps1 index 145762d51ce5f7890f8f3b32f0b38354ba5525ee..ec7229c71e10af9136bff4bd46033598561c9dea 100644 --- a/scripts/docker/docker-pull-insider-async.ps1 +++ b/scripts/docker/docker-pull-insider-async.ps1 @@ -14,4 +14,3 @@ function DockerPull { DockerPull microsoft/windowsservercore-insider DockerPull microsoft/nanoserver-insider -DockerPull microsoft/nanoserver-insider-powershell diff --git a/scripts/docker/docker-pull-local.ps1 b/scripts/docker/docker-pull-local.ps1 index 33afbe8be7627cfd122628c09c2009a1fcfd04cc..32c9a102fc374f58ceb4b03905ebcb395fefc9c1 100644 --- a/scripts/docker/docker-pull-local.ps1 +++ b/scripts/docker/docker-pull-local.ps1 @@ -5,7 +5,7 @@ #} Write-Host "Downloading nanoserver image" -docker import http://172.16.63.1:8080/CBaseOs_rs3_release_16278.1000.170825-1441_amd64fre_NanoServer_en-us.tar.gz microsoft/nanoserver-insider:latest -Write-Host "Downloading windowsservercore image" -docker import http://172.16.63.1:8080/CBaseOs_rs3_release_16278.1000.170825-1441_amd64fre_ServerDatacenterCore_en-us.tar.gz microsoft/windowsservercore-insider:latest +docker import http://172.16.236.1:8080/CBaseOs_rs_prerelease_17035.1000.171103-1616_amd64fre_NanoServer_en-us.tar.gz microsoft/nanoserver-insider:latest +#Write-Host "Downloading windowsservercore image" +#docker import http://172.16.236.1:8080/CBaseOs_rs_prerelease_17035.1000.171103-1616_amd64fre_ServerDatacenterCore_en-us.tar.gz microsoft/windowsservercore-insider:latest docker images diff --git a/windows_server_insider.json b/windows_server_insider.json new file mode 100644 index 0000000000000000000000000000000000000000..8f47a3c8a9c2000128c2862b365969fd2d563670 --- /dev/null +++ b/windows_server_insider.json @@ -0,0 +1,138 @@ +{ + "builders": [ + { + "vm_name": "WindowsServerInsider", + "type": "hyperv-iso", + "disk_size": "{{user `disk_size`}}", + "boot_wait": "60s", + "guest_additions_mode": "disable", + "iso_url": "{{user `iso_url`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "floppy_files": [ + "{{user `autounattend`}}", + "./scripts/disable-screensaver.ps1", + "./scripts/disable-winrm.ps1", + "./scripts/enable-winrm.ps1" + ], + "communicator": "winrm", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "{{user `winrm_timeout`}}", + "shutdown_command": + "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "ram_size": 2048, + "cpu": 2, + "switch_name": "{{user `hyperv_switchname`}}", + "enable_secure_boot": true, + "enable_virtualization_extensions": true + }, + { + "vm_name": "WindowsServerInsider", + "type": "vmware-iso", + "communicator": "winrm", + "iso_url": "{{user `iso_url`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "headless": "{{user `headless`}}", + "boot_wait": "60s", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "{{user `winrm_timeout`}}", + "shutdown_command": + "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "guest_os_type": "windows9srv-64", + "disk_size": "{{user `disk_size`}}", + "disk_type_id": "{{user `disk_type_id`}}", + "vnc_port_min": 5900, + "vnc_port_max": 5980, + "floppy_files": [ + "{{user `autounattend`}}", + "./scripts/disable-winrm.ps1", + "./scripts/enable-winrm.ps1" + ], + "vmx_data": { + "RemoteDisplay.vnc.enabled": "false", + "RemoteDisplay.vnc.port": "5900", + "memsize": "2048", + "numvcpus": "2", + "scsi0.virtualDev": "lsisas1068", + "virtualHW.version": "12", + "vhv.enable": "{{user `vhv_enable`}}" + } + }, + { + "vm_name": "WindowsServerInsider", + "type": "virtualbox-iso", + "communicator": "winrm", + "iso_url": "{{user `iso_url`}}", + "iso_checksum_type": "{{user `iso_checksum_type`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "headless": "{{user `headless`}}", + "boot_wait": "60s", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "{{user `winrm_timeout`}}", + "shutdown_command": + "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "guest_os_type": "Windows2012_64", + "guest_additions_mode": "disable", + "disk_size": "{{user `disk_size`}}", + "floppy_files": [ + "{{user `autounattend`}}", + "./scripts/disable-screensaver.ps1", + "./scripts/disable-winrm.ps1", + "./scripts/enable-winrm.ps1" + ], + "vboxmanage": [ + ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] + ] + } + ], + "provisioners": [ + { + "type": "windows-shell", + "execute_command": "{{ .Vars }} cmd /c \"{{ .Path }}\"", + "scripts": ["./scripts/vm-guest-tools.bat", "./scripts/enable-rdp.bat"] + }, + { + "type": "windows-restart", + "restart_timeout": "{{user `restart_timeout`}}" + }, + { + "type": "windows-shell", + "execute_command": "{{ .Vars }} cmd /c \"{{ .Path }}\"", + "scripts": [ + "./scripts/set-winrm-automatic.bat", + "./scripts/compile-dotnet-assemblies.bat", + "./scripts/uac-enable.bat", + "./scripts/compact.bat" + ] + } + ], + "post-processors": [ + { + "type": "vagrant", + "keep_input_artifact": false, + "output": "windows_server_insider_{{.Provider}}.box", + "vagrantfile_template": "vagrantfile-windows_2016.template" + } + ], + "variables": { + "headless": "false", + "disk_size": "61440", + "disk_type_id": "1", + "vhv_enable": "false", + "manually_download_iso_from": + "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver", + "iso_url": + "https://software-download.microsoft.com/sg/Windows_InsiderPreview_Server_17035.iso", + "iso_checksum_type": "sha256", + "iso_checksum": + "dd412bd5c7d29fa5166a10f4cb36dacf7fcb605a5b8e8a6e8fa87e13aed6851d", + "autounattend": "./answer_files/server_insider/Autounattend.xml", + "restart_timeout": "5m", + "winrm_timeout": "2h" + } +} diff --git a/windows_2016_insider.json b/windows_server_insider_docker.json similarity index 61% rename from windows_2016_insider.json rename to windows_server_insider_docker.json index 6eb250db1ad8274131be24eb4912a1eabc0dc7de..18b8be208a23dd491f680761fdebc4ee204c0954 100644 --- a/windows_2016_insider.json +++ b/windows_server_insider_docker.json @@ -1,11 +1,11 @@ { "builders": [ { - "vm_name":"WindowsServer2016Insider", + "vm_name": "WindowsServerInsiderDocker", "type": "hyperv-iso", - "disk_size": 41440, + "disk_size": "{{user `disk_size`}}", "boot_wait": "60s", - "guest_additions_mode":"disable", + "guest_additions_mode": "disable", "iso_url": "{{user `iso_url`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_checksum": "{{user `iso_checksum`}}", @@ -15,18 +15,20 @@ "./scripts/disable-winrm.ps1", "./scripts/enable-winrm.ps1" ], - "communicator":"winrm", + "communicator": "winrm", "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout" : "{{user `winrm_timeout`}}", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "winrm_timeout": "{{user `winrm_timeout`}}", + "shutdown_command": + "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "ram_size": 2048, "cpu": 2, - "switch_name":"{{user `hyperv_switchname`}}", - "enable_secure_boot":true, - "enable_virtualization_extensions":true + "switch_name": "{{user `hyperv_switchname`}}", + "enable_secure_boot": true, + "enable_virtualization_extensions": true }, { + "vm_name": "WindowsServerInsiderDocker", "type": "vmware-iso", "communicator": "winrm", "iso_url": "{{user `iso_url`}}", @@ -36,10 +38,12 @@ "boot_wait": "60s", "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout" : "{{user `winrm_timeout`}}", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "winrm_timeout": "{{user `winrm_timeout`}}", + "shutdown_command": + "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "guest_os_type": "windows9srv-64", - "disk_size": 61440, + "disk_size": "{{user `disk_size`}}", + "disk_type_id": "{{user `disk_type_id`}}", "vnc_port_min": 5900, "vnc_port_max": 5980, "floppy_files": [ @@ -53,10 +57,12 @@ "memsize": "2048", "numvcpus": "2", "scsi0.virtualDev": "lsisas1068", - "virtualHW.version": "12" + "virtualHW.version": "12", + "vhv.enable": "{{user `vhv_enable`}}" } }, { + "vm_name": "WindowsServerInsiderDocker", "type": "virtualbox-iso", "communicator": "winrm", "iso_url": "{{user `iso_url`}}", @@ -66,11 +72,12 @@ "boot_wait": "60s", "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout" : "{{user `winrm_timeout`}}", - "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "winrm_timeout": "{{user `winrm_timeout`}}", + "shutdown_command": + "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", "guest_os_type": "Windows2012_64", "guest_additions_mode": "disable", - "disk_size": 61440, + "disk_size": "{{user `disk_size`}}", "floppy_files": [ "{{user `autounattend`}}", "./scripts/disable-screensaver.ps1", @@ -78,34 +85,19 @@ "./scripts/enable-winrm.ps1" ], "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "2048" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "2" - ] + ["modifyvm", "{{.Name}}", "--memory", "2048"], + ["modifyvm", "{{.Name}}", "--cpus", "2"] ] } ], "provisioners": [ { "type": "windows-shell", - "scripts": [ - "./scripts/vm-guest-tools.bat", - "./scripts/enable-rdp.bat" - ] + "scripts": ["./scripts/vm-guest-tools.bat", "./scripts/enable-rdp.bat"] }, { "type": "powershell", - "scripts": [ - "./scripts/docker/2016/install-containers-feature.ps1" - ] + "scripts": ["./scripts/docker/2016/install-containers-feature.ps1"] }, { "type": "windows-restart", @@ -121,34 +113,29 @@ "./scripts/docker/remove-docker-key-json.ps1", "./scripts/docker/disable-windows-defender.ps1" ] - }, - { - "type": "windows-restart", - "restart_timeout": "{{user `restart_timeout`}}" - }, - { - "type": "windows-shell", - "scripts": [ - "./scripts/compile-dotnet-assemblies.bat", - "./scripts/compact.bat" - ] } ], "post-processors": [ { "type": "vagrant", "keep_input_artifact": false, - "output": "windows_2016_insider_{{.Provider}}.box", + "output": "windows_server_insider_docker_{{.Provider}}.box", "vagrantfile_template": "vagrantfile-windows_2016.template" } ], "variables": { "headless": "false", - "manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver", - "iso_url": "https://software-download.microsoft.com/pr/Windows_InsiderPreview_Server_16278.iso", + "disk_size": "61440", + "disk_type_id": "1", + "vhv_enable": "false", + "manually_download_iso_from": + "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver", + "iso_url": + "https://software-download.microsoft.com/sg/Windows_InsiderPreview_Server_17035.iso", "iso_checksum_type": "sha256", - "iso_checksum": "f87ebde2f4dc7094d2e01819d370cb8d06d2bcde520d3bdf9e8ce7e70a8ea5da", - "autounattend": "./answer_files/2016_insider/Autounattend.xml", + "iso_checksum": + "dd412bd5c7d29fa5166a10f4cb36dacf7fcb605a5b8e8a6e8fa87e13aed6851d", + "autounattend": "./answer_files/server_insider/Autounattend.xml", "restart_timeout": "5m", "winrm_timeout": "2h" }