Skip to content

Commit

Permalink
Support setting the box version, closes #2750
Browse files Browse the repository at this point in the history
  • Loading branch information
tomjn committed Feb 23, 2025
1 parent 441dfc9 commit a6c61cf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 6 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a6c61cf

Please # to comment.