From a6c61cf10a71a69092a4372704378fed9e764e4f Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Sun, 23 Feb 2025 12:34:22 +0000 Subject: [PATCH] Support setting the box version, closes #2750 --- CHANGELOG.md | 2 +- Vagrantfile | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e59b4b3b3..a2b16f457 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ permalink: /docs/en-US/changelog/ * Provisioner/Hook timings now show milliseconds ( #2735 ) * Added a `skip_site_provisioner_update` option to prevent site provisioners being overwritten by updates ( #2733 ) * Only start services that aren't running in post-up scripts ( #2732 ) -* Added a warning for Virtualbox Arm64 users ( #2749 ) +* Added a new `box_version` parameter for `config.yml` ( #2749 ) ### Bug Fixes diff --git a/Vagrantfile b/Vagrantfile index c3f818cdb..e769e7655 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -498,10 +498,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # to your host computer, it is cached for future use under the specified box name. override.vm.box = 'bento/ubuntu-20.04' - if Etc.uname[:version].include? 'ARM64' - puts "WARNING: VirtualBox under Arm/Apple Silicon is unsupported, proceed at own risk." - end - # If we're at a contributor day, switch the base box to the prebuilt one if defined? vvv_config['vm_config']['wordcamp_contributor_day_box'] if vvv_config['vm_config']['wordcamp_contributor_day_box'] == true @@ -516,6 +512,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end end + if defined? vvv_config['vm_config']['box_version'] + unless vvv_config['vm_config']['box_version'].nil? + config.vm.box_version = vvv_config['vm_config']['box_version'] + end + end + config.vm.hostname = 'vvv' # Specify disk size