Skip to content

Commit

Permalink
Remove filters aimed at detecting running containers as they turn
Browse files Browse the repository at this point in the history
out to be unnecessary and contradicting the intended logic (rockstor#2242)
  • Loading branch information
FroggyFlox committed Jan 24, 2021
1 parent 7fe71d6 commit f621d6e
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/rockstor/system/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,14 @@ def probe_containers(container=None, network=None, all=False):
]
if docker_status():
if all:
cmd.extend((["-a",]))
cmd.extend(["-a",])
if network:
cmd.extend((["--filter", "network={}".format(network),]))
cmd.extend(["--filter", "network={}".format(network),])
if container:
cmd.extend((running_filters + ["--filter", "name={}".format(container),]))
else:
cmd.extend((running_filters))
# cmd.extend((running_filters + ["--filter", "name={}".format(container),]))
cmd.extend(["--filter", "name={}".format(container),])
# else:
# cmd.extend((running_filters))
o, e, rc = run_command(cmd)
return o

Expand Down

0 comments on commit f621d6e

Please sign in to comment.