From 9c1423de76db2c06c9a7bf6d53d1385e5c49db03 Mon Sep 17 00:00:00 2001 From: Chris Long Date: Sun, 3 Mar 2019 16:14:18 -0800 Subject: [PATCH] Update Win10 boxes, hashes, update build Vagrant to 2.2.4 --- README.md | 4 ++-- build.ps1 | 4 ++-- build.sh | 4 ++-- ci/build_machine_bootstrap.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4f288d0..ebe4c93 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,9 @@ Windows users will want to use the following script: Provider | Box | URL | MD5 | Size ------------|-----|-----|----|---- Virtualbox |Windows 2016 | https://www.detectionlab.network/windows_2016_virtualbox.box | 231b54077d4396cad01e4cd60651b1e0 | 7.9GB -Virtualbox | Windows 10 | https://www.detectionlab.network/windows_10_virtualbox.box | 54b9c596486a47f208d952337748079b | 6.4GB +Virtualbox | Windows 10 | https://www.detectionlab.network/windows_10_virtualbox.box | c03f10f21b8d79e6acca2b2965b23046 | 6.4GB VMware | Windows 2016 | https://www.detectionlab.network/windows_2016_vmware.box | 2bbaf5a1177e0499dc3aacdb0246eb38 | 8.2GB -VMware | Windows 10 | https://www.detectionlab.network/windows_10_vmware.box | e754a214c548312746632c870cc40c24 | 5.9GB +VMware | Windows 10 | https://www.detectionlab.network/windows_10_vmware.box | b334c3ba5be3b29840567ffe368db5fe | 5.9GB If you choose to download the boxes, you may skip steps 2 and 3. If you don't trust pre-built boxes, I recommend following steps 2 and 3 to build them on your machine. diff --git a/build.ps1 b/build.ps1 index 8d2a680..b7f3e67 100644 --- a/build.ps1 +++ b/build.ps1 @@ -180,11 +180,11 @@ function list_providers { function download_boxes { Write-Host '[download_boxes] Running..' if ($PackerProvider -eq 'virtualbox') { - $win10Hash = '54b9c596486a47f208d952337748079b' + $win10Hash = 'c03f10f21b8d79e6acca2b2965b23046' $win2016Hash = '231b54077d4396cad01e4cd60651b1e0' } if ($PackerProvider -eq 'vmware') { - $win10Hash = 'e754a214c548312746632c870cc40c24' + $win10Hash = 'b334c3ba5be3b29840567ffe368db5fe' $win2016Hash = '2bbaf5a1177e0499dc3aacdb0246eb38' } diff --git a/build.sh b/build.sh index 581c779..c87905a 100755 --- a/build.sh +++ b/build.sh @@ -401,7 +401,7 @@ download_boxes() { fi # Verify hashes of VirtualBox boxes if [ "$PACKER_PROVIDER" == "virtualbox" ]; then - if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_10_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "54b9c596486a47f208d952337748079b" ]; then + if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_10_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "c03f10f21b8d79e6acca2b2965b23046" ]; then (echo >&2 "Hash mismatch on windows_10_virtualbox.box") (echo >&2 "The boxes may have been updated since you last ran the build script. Try updating the git repository to retrieve the latest hashes.") fi @@ -411,7 +411,7 @@ download_boxes() { fi # Verify hashes of VMware boxes elif [ "$PACKER_PROVIDER" == "vmware" ]; then - if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_10_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "e754a214c548312746632c870cc40c24" ]; then + if [ "$("$MD5TOOL" "$DL_DIR"/Boxes/windows_10_"$PACKER_PROVIDER".box | cut -d ' ' -f "$CUT_INDEX")" != "b334c3ba5be3b29840567ffe368db5fe" ]; then (echo >&2 "Hash mismatch on windows_10_vmware.box") (echo >&2 "The boxes may have been updated since you last ran the build script. Try updating the git repository to retrieve the latest hashes.") exit 1 diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh index 5dea161..77d6c4e 100755 --- a/ci/build_machine_bootstrap.sh +++ b/ci/build_machine_bootstrap.sh @@ -53,8 +53,8 @@ if [ "$PACKER_ONLY" -eq 0 ]; then # Install Vagrant mkdir /opt/vagrant cd /opt/vagrant || exit 1 - wget https://releases.hashicorp.com/vagrant/2.2.3/vagrant_2.2.3_x86_64.deb - dpkg -i vagrant_2.2.3_x86_64.deb + wget https://releases.hashicorp.com/vagrant/2.2.4/vagrant_2.2.4_x86_64.deb + dpkg -i vagrant_2.2.4_x86_64.deb vagrant plugin install vagrant-reload # Make the Vagrant instances headless