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.

Sign up for GitHub

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

Check for parallels instead of docker #2722

Merged
merged 2 commits into from
Jul 22, 2024
Merged

Check for parallels instead of docker #2722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
435ad38
check for parallels instead of docker
tomjn Jul 19, 2024
0cab676
Update CHANGELOG.md
tomjn Jul 22, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ permalink: /docs/en-US/changelog/

## 3.14 ( 2024 ETA )

### Bug Fixes

* VVV will check if Parallels is installed before defaulting to docker on Arm64/Apple Silicon due to issues with Docker detection ( #2722 )

## 3.13.2 ( 2024 July 19th )

Expand Down
7 changes: 4 additions & 3 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def vvv_is_docker_present()
if `docker version`
return true
end
return false
end

def vvv_is_parallels_present()
Expand Down Expand Up @@ -230,10 +231,10 @@ defaults['provider'] = 'virtualbox'

# if Arm default to docker then parallels
if Etc.uname[:version].include? 'ARM64'
if vvv_is_docker_present()
defaults['provider'] = 'docker'
else
if vvv_is_parallels_present()
defaults['provider'] = 'parallels'
else
defaults['provider'] = 'docker'
end
end

Expand Down
Loading