almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Also pass common into launch_docker_windows function

Browse source
This commit is contained in:
Micah Lee 2020-02-20 09:46:34 -08:00
parent 81627379f6
commit 65121ed729
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dangerzone/__init__.py
View file

@ -64,7 +64,7 @@ def main(filename):
if not is_docker_ready(common): if not is_docker_ready(common):
print("Docker is not running") print("Docker is not running")
launch_docker_windows() launch_docker_windows(common)
# Wait up to 20 minutes for docker to be ready # Wait up to 20 minutes for docker to be ready
for i in range(120): for i in range(120):

2
dangerzone/docker_installer.py
View file

@ -38,7 +38,7 @@ def is_docker_ready(common):
return False return False
def launch_docker_windows(): def launch_docker_windows(common):
docker_desktop_path = "C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe" docker_desktop_path = "C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe"
subprocess.Popen( subprocess.Popen(
[docker_desktop_path], startupinfo=common.get_subprocess_startupinfo() [docker_desktop_path], startupinfo=common.get_subprocess_startupinfo()