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

Jump to bottom

[Mellanox] change the implementation of is_host() to fix a stuck issue on simx platform #13100

Merged
merged 2 commits into from
Dec 20, 2022
Merged

[Mellanox] change the implementation of is_host() to fix a stuck issue on simx platform #13100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b07243
change the implementation of is_host()
keboliu Dec 16, 2022
0f1fafe
fix internal review comments
keboliu Dec 19, 2022
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
13 changes: 2 additions & 11 deletions platform/mellanox/mlnx-platform-api/sonic_platform/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,8 @@ def is_host():
Test whether current process is running on the host or an docker
return True for host and False for docker
"""
try:
proc = subprocess.Popen(["docker", "--version"],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
universal_newlines=True)
stdout = proc.communicate()[0]
proc.wait()
result = stdout.rstrip('\n')
return result != ''
except OSError as e:
return False
docker_env_file = '/.dockerenv'
return os.path.exists(docker_env_file) is False


def default_return(return_value, log_func=logger.log_debug):
Expand Down