From 7b7c787e7c8fc9b46d737deb9177d2e9d40ee15f Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Wed, 3 Oct 2018 10:03:56 +0200 Subject: [PATCH 1/3] Update to first Windows Server 2019 ISO --- README.md | 4 ++-- answer_files/2019/Autounattend.xml | 2 +- build_windows_2019.sh | 2 +- windows_2019.json | 4 ++-- windows_2019_core.json | 4 ++-- windows_2019_docker.json | 4 ++-- windows_2019_docker_azure.json | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ab66b82d..3cf4ec64 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,13 @@ The following Windows versions are known to work (built with VMware Fusion Pro * Windows 10 1803 -> Vagrant Cloud box [StefanScherer/windows_10](https://app.vagrantup.com/StefanScherer/boxes/windows_10) * Windows 10 Insider * Windows Server 2016 Desktop -> Vagrant Cloud box [StefanScherer/windows_2016](https://app.vagrantup.com/StefanScherer/boxes/windows_2016) -* Windows Server 2019 Desktop (Insider Preview) +* Windows Server 2019 Desktop -> Vagrant Cloud box [StefanScherer/windows_2019](https://app.vagrantup.com/StefanScherer/boxes/windows_2019) * Windows Server Core * Windows Server 2016 without and with Docker -> Vagrant Cloud box [StefanScherer/windows_2016_docker](https://app.vagrantup.com/StefanScherer/boxes/windows_2016_docker) + * Windows Server 2019 without and with Docker -> Vagrant Cloud box [StefanScherer/windows_2019_docker](https://app.vagrantup.com/StefanScherer/boxes/windows_2019_docker) * Windows Server 1709 without and with Docker * Windows Server 1803 without and with Docker * Windows Server InsiderPreview Semi-Annual without and with Docker - * Windows Server 2019 Core(Insider Preview) You may find other packer template files, but older versions of Windows doesn't work so nice with a Retina display. diff --git a/answer_files/2019/Autounattend.xml b/answer_files/2019/Autounattend.xml index b51fc964..be06fbd7 100644 --- a/answer_files/2019/Autounattend.xml +++ b/answer_files/2019/Autounattend.xml @@ -65,7 +65,7 @@ - 6XBNX-4JQGW-QX6QG-74P76-72V67 + OnError true diff --git a/build_windows_2019.sh b/build_windows_2019.sh index ce01c42f..29b9ddf3 100755 --- a/build_windows_2019.sh +++ b/build_windows_2019.sh @@ -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_17744.iso \ + --var iso_url=~/downloads/17763.1.180914-1434.rs5_release_SERVER_EVAL_x64FRE_en-us.iso \ windows_2019.json diff --git a/windows_2019.json b/windows_2019.json index 7e58c65e..b988b772 100644 --- a/windows_2019.json +++ b/windows_2019.json @@ -156,9 +156,9 @@ "disk_type_id": "1", "headless": "false", "hyperv_switchname": "{{env `hyperv_switchname`}}", - "iso_checksum": "4dae6fed7bbb9a30a4e1453020bbaa39e88f37a2962bdf7bb81705cd9318f695", + "iso_checksum": "dbb0ffbab5d114ce7370784c4e24740191fefdb3349917c77a53ff953dd10f72", "iso_checksum_type": "sha256", - "iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17744.iso", + "iso_url": "https://software-download.microsoft.com/download/pr/17763.1.180914-1434.rs5_release_SERVER_EVAL_x64FRE_en-us.iso", "manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver", "restart_timeout": "5m", "winrm_timeout": "2h" diff --git a/windows_2019_core.json b/windows_2019_core.json index cb2ee132..023dd58d 100644 --- a/windows_2019_core.json +++ b/windows_2019_core.json @@ -138,9 +138,9 @@ "disk_size": "61440", "disk_type_id": "1", "headless": "false", - "iso_checksum": "4dae6fed7bbb9a30a4e1453020bbaa39e88f37a2962bdf7bb81705cd9318f695", + "iso_checksum": "dbb0ffbab5d114ce7370784c4e24740191fefdb3349917c77a53ff953dd10f72", "iso_checksum_type": "sha256", - "iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17744.iso", + "iso_url": "https://software-download.microsoft.com/download/pr/17763.1.180914-1434.rs5_release_SERVER_EVAL_x64FRE_en-us.iso", "manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver", "winrm_timeout": "6h" } diff --git a/windows_2019_docker.json b/windows_2019_docker.json index 6fa72668..879e085b 100644 --- a/windows_2019_docker.json +++ b/windows_2019_docker.json @@ -174,9 +174,9 @@ "docker_provider": "ee", "docker_version": "18-03-1-ee-3", "headless": "false", - "iso_checksum": "4dae6fed7bbb9a30a4e1453020bbaa39e88f37a2962bdf7bb81705cd9318f695", + "iso_checksum": "dbb0ffbab5d114ce7370784c4e24740191fefdb3349917c77a53ff953dd10f72", "iso_checksum_type": "sha256", - "iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17744.iso", + "iso_url": "https://software-download.microsoft.com/download/pr/17763.1.180914-1434.rs5_release_SERVER_EVAL_x64FRE_en-us.iso", "manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver", "restart_timeout": "5m", "vhv_enable": "false", diff --git a/windows_2019_docker_azure.json b/windows_2019_docker_azure.json index 3bd36ebc..1584b66e 100644 --- a/windows_2019_docker_azure.json +++ b/windows_2019_docker_azure.json @@ -101,9 +101,9 @@ "docker_version": "18-03-1-ee-3", "headless": "false", "hyperv_switchname": "{{env `hyperv_switchname`}}", - "iso_checksum": "4dae6fed7bbb9a30a4e1453020bbaa39e88f37a2962bdf7bb81705cd9318f695", + "iso_checksum": "dbb0ffbab5d114ce7370784c4e24740191fefdb3349917c77a53ff953dd10f72", "iso_checksum_type": "sha256", - "iso_url": "https://software-download.microsoft.com/db/Windows_InsiderPreview_Server_vNext_en-us_17744.iso", + "iso_url": "https://software-download.microsoft.com/download/pr/17763.1.180914-1434.rs5_release_SERVER_EVAL_x64FRE_en-us.iso", "manually_download_iso_from": "https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewserver", "restart_timeout": "5m", "winrm_timeout": "2h" From c2d1cd46727764e02d89e381ae4cc4487256df2d Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Wed, 3 Oct 2018 10:04:13 +0200 Subject: [PATCH 2/3] Update VMware tools and VBox Additions --- scripts/vm-guest-tools.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vm-guest-tools.bat b/scripts/vm-guest-tools.bat index 480b3221..b3d7df4d 100644 --- a/scripts/vm-guest-tools.bat +++ b/scripts/vm-guest-tools.bat @@ -18,7 +18,7 @@ if exist "C:\Users\vagrant\windows.iso" ( ) if not exist "C:\Windows\Temp\windows.iso" ( - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://softwareupdate.vmware.com/cds/vmw-desktop/ws/14.1.3/9474260/windows/packages/tools-windows.tar', 'C:\Windows\Temp\vmware-tools.tar')" Date: Wed, 3 Oct 2018 10:37:17 +0200 Subject: [PATCH 3/3] Update Docker image tags --- Dockerfile | 4 ++-- build_windows_2019_docker.sh | 4 ++-- upload-vhd.ps1 | 2 +- windows_2019_docker.json | 2 +- windows_2019_docker_azure.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d66e089f..5f08d145 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/windows-insider:10.0.17744.1001 AS makeiso +FROM mcr.microsoft.com/windows:ltsc2019 AS makeiso WORKDIR C:/source COPY . . RUN powershell -NoProfile -ExecutionPolicy unrestricted -file make_unattend_iso.ps1 -FROM mcr.microsoft.com/windowsservercore-insider:10.0.17744.1001 +FROM mcr.microsoft.com/windowsservercore:ltsc2019 ENV chocolateyUseWindowsCompression false RUN powershell -NoProfile -ExecutionPolicy unrestricted -Command \ diff --git a/build_windows_2019_docker.sh b/build_windows_2019_docker.sh index 0c702d76..5115997a 100755 --- a/build_windows_2019_docker.sh +++ b/build_windows_2019_docker.sh @@ -3,6 +3,6 @@ packer build \ --only=vmware-iso \ --var vhv_enable=true \ - --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" \ + --var iso_url=~/downloads/17763.1.180914-1434.rs5_release_SERVER_EVAL_x64FRE_en-us.iso \ + --var "docker_images=mcr.microsoft.com/nanoserver:sac2019 mcr.microsoft.com/windowsservercore:ltsc2019 mcr.microsoft.com/windows:ltsc2019" \ windows_2019_docker.json diff --git a/upload-vhd.ps1 b/upload-vhd.ps1 index e6ac21cb..ceb6db35 100644 --- a/upload-vhd.ps1 +++ b/upload-vhd.ps1 @@ -20,7 +20,7 @@ $urlOfUploadedImageVhd = ('https://' + $storageaccount + '.blob.core.windows.net Add-AzureRmVhd -ResourceGroupName $resourceGroup -Destination $urlOfUploadedImageVhd ` -LocalFilePath 'D:\work\output-hyperv-iso\Virtual Hard Disks\WindowsServer2019Docker.vhd' -$imageName="windows_2019_docker_17744" +$imageName="windows_2019_docker_17763" $imageConfig = New-AzureRmImageConfig -Location $location $imageConfig = Set-AzureRmImageOsDisk -Image $imageConfig -OsType Windows -OsState Generalized ` -BlobUri $urlOfUploadedImageVhd diff --git a/windows_2019_docker.json b/windows_2019_docker.json index 879e085b..4dd75920 100644 --- a/windows_2019_docker.json +++ b/windows_2019_docker.json @@ -170,7 +170,7 @@ "autounattend": "./answer_files/2019_core/Autounattend.xml", "disk_size": "61440", "disk_type_id": "1", - "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_images": "mcr.microsoft.com/nanoserver:sac2019 mcr.microsoft.com/windowsservercore:ltsc2019 mcr.microsoft.com/windows:ltsc2019", "docker_provider": "ee", "docker_version": "18-03-1-ee-3", "headless": "false", diff --git a/windows_2019_docker_azure.json b/windows_2019_docker_azure.json index 1584b66e..d5af4956 100644 --- a/windows_2019_docker_azure.json +++ b/windows_2019_docker_azure.json @@ -96,7 +96,7 @@ "autounattend": "./answer_files/2019/Autounattend.xml", "disk_size": "51200", "disk_type_id": "1", - "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_images": "mcr.microsoft.com/nanoserver:sac2019 mcr.microsoft.com/windowsservercore:ltsc2019 mcr.microsoft.com/windows:ltsc2019", "docker_provider": "ee", "docker_version": "18-03-1-ee-3", "headless": "false",