Skip to content

Commit

Permalink
Merge pull request #2749 from Varying-Vagrant-Vagrants/parallels-non-…
Browse files Browse the repository at this point in the history
…arm64-bento-box

Switch parallels box
  • Loading branch information
tomjn authored Feb 23, 2025
2 parents dbd1071 + a6c61cf commit 8617a76
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +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 new `box_version` parameter for `config.yml` ( #2749 )

### Bug Fixes

Expand All @@ -22,6 +23,7 @@ permalink: /docs/en-US/changelog/
* Switched from Starburst to OVH for MariaDB mirrors ( #2741 )
* Fixes for service starts under some situations in Docker ( #2732 )
* Fixed an issue with trailing slashes and site provisioners introduced in an earlier version (#2731)
* Switched Parallels box to non-arm64 and pinned to a specific version for Arm devices ( #2749 )

### Maintenance

Expand Down
12 changes: 8 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -459,11 +459,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provider :parallels do |_v, override|
override.vm.box = 'bento/ubuntu-20.04'

# Vagrant currently runs under Rosetta on M1 devices. As a result,
# this seems to be the most reliable way to detect whether or not we're
# running under ARM64.
# Pin the arm64 version of the box to a specific version we know has an arm build.
if Etc.uname[:version].include? 'ARM64'
override.vm.box = 'bento/ubuntu-20.04-arm64'
config.vm.box_version = "202404.23.0"
end
end

Expand Down Expand Up @@ -514,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 8617a76

Please # to comment.