Skip to content

Commit 62f6429

Browse files
authored
fix: docker on win (#434)
1 parent 2ab2fd6 commit 62f6429

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

core/utils/docker.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,24 @@ class Docker(object):
1313
def start():
1414
if Settings.HOST_OS == OSType.WINDOWS:
1515
docker = os.environ.get("DOCKER_HOME")
16-
if docker is not None:
17-
cmd = '"' + os.path.join(docker, 'Docker Desktop.exe') + '"'
18-
run(cmd=cmd, wait=False)
19-
Log.info('Starting docker!')
20-
else:
21-
cmd = r'"C:\Program Files\Docker\Docker\Docker Desktop.exe"'
16+
if not Process.is_running_by_name('Docker Desktop'):
17+
if docker is not None:
18+
cmd = '"' + os.path.join(docker, 'Docker Desktop.exe') + '"'
19+
run(cmd=cmd, wait=False)
20+
Log.info('Starting docker!')
21+
else:
22+
cmd = r'"C:\Program Files\Docker\Docker\Docker Desktop.exe"'
23+
run(cmd=cmd, wait=False)
24+
Log.info('Starting docker!')
25+
elif OSUtils.is_catalina():
26+
if not Process.is_running_by_name('docker'):
27+
cmd = 'open --background -a Docker'
2228
run(cmd=cmd, wait=False)
2329
Log.info('Starting docker!')
24-
elif OSUtils.is_catalina():
25-
cmd = 'open --background -a Docker'
26-
run(cmd=cmd, wait=False)
27-
Log.info('Starting docker!')
2830
else:
2931
Log.info('No need to start docker!')
3032

3133
@staticmethod
3234
def stop():
33-
if Settings.HOST_OS == OSType.WINDOWS:
34-
Process.kill('Docker Desktop')
35-
Process.kill('Docker.Watchguard')
36-
Process.kill('com.docker.backend')
37-
Process.kill('com.docker.proxy')
3835
if OSUtils.is_catalina():
3936
Process.kill('Docker')

0 commit comments

Comments
 (0)