Skip to content

Commit 8f4eaaa

Browse files
authored
Merge pull request #2722 from Varying-Vagrant-Vagrants/fix/docker-check
Check for parallels instead of docker
2 parents d83e144 + 0cab676 commit 8f4eaaa

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ permalink: /docs/en-US/changelog/
88

99
## 3.14 ( 2024 ETA )
1010

11+
### Bug Fixes
12+
13+
* VVV will check if Parallels is installed before defaulting to docker on Arm64/Apple Silicon due to issues with Docker detection ( #2722 )
1114

1215
## 3.13.2 ( 2024 July 19th )
1316

Vagrantfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def vvv_is_docker_present()
4545
if `docker version`
4646
return true
4747
end
48+
return false
4849
end
4950

5051
def vvv_is_parallels_present()
@@ -230,10 +231,10 @@ defaults['provider'] = 'virtualbox'
230231

231232
# if Arm default to docker then parallels
232233
if Etc.uname[:version].include? 'ARM64'
233-
if vvv_is_docker_present()
234-
defaults['provider'] = 'docker'
235-
else
234+
if vvv_is_parallels_present()
236235
defaults['provider'] = 'parallels'
236+
else
237+
defaults['provider'] = 'docker'
237238
end
238239
end
239240

0 commit comments

Comments
 (0)