Skip to content

Commit

Permalink
Merge pull request #1347 from roots/revert-1346-arm64-parallels
Browse files Browse the repository at this point in the history
Revert "Default to proper box for M1 macs"
  • Loading branch information
swalkinshaw authored Jan 2, 2022
2 parents 8a87df8 + 47b04b7 commit 7a85b29
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,7 @@ trellis_config = Trellis::Config.new(root_path: ANSIBLE_PATH)
Vagrant.require_version '>= 2.1.0', '< 2.2.19'

Vagrant.configure('2') do |config|
vagrant_box = if Vagrant::Util::Platform.darwin? && `uname -m`.chomp == "arm64"
'jeffnoxon/ubuntu-20.04-arm64'
else
vconfig.fetch('vagrant_box')
end

config.vm.box = vagrant_box
config.vm.box = vconfig.fetch('vagrant_box')
config.vm.box_version = vconfig.fetch('vagrant_box_version')
config.ssh.forward_agent = true
config.vm.post_up_message = post_up_message
Expand Down

0 comments on commit 7a85b29

Please sign in to comment.