Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch parallels box #2749

Merged
merged 5 commits into from
Feb 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading