Skip to content

[docker-wait-any] Convert to Python 3, install dependency in host OS #5784

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

Merged
jleveque merged 4 commits into from
Nov 5, 2020
Merged

[docker-wait-any] Convert to Python 3, install dependency in host OS #5784

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17c48b8
[docker-wait-any] Convert to Python 3
Nov 2, 2020
d11f30c
Install Python 3 library for the Docker Engine API in host OS
Nov 2, 2020
ce973f7
Move Python 3 docker install to build_debian.sh; Upgrade Python 2 ins…
Nov 2, 2020
6f06c56
Revert back to known good version for Python 2 docker package
Nov 3, 2020
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
3 changes: 3 additions & 0 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install ipaddr
# Install Python module for psutil
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install psutil

# Install Python 3 library for the Docker Engine API
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install docker==4.3.1

# Install SwSS SDK Python 3 package
# Note: the scripts will be overwritten by corresponding Python 2 package
if [ -e {{swsssdk_py3_wheel_path}} ]; then
Expand Down
5 changes: 2 additions & 3 deletions files/image_config/misc/docker-wait-any
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

"""
docker-wait-any
Expand All @@ -23,7 +23,7 @@
cases where we need the dependent container to be warm-restarted without
affecting other services (eg: warm restart of teamd service)

NOTE: This script is written against docker Python package 4.1.0. Newer
NOTE: This script is written against docker Python package 4.3.1. Newer
versions of docker may have a different API.
"""
import argparse
Expand Down Expand Up @@ -68,7 +68,6 @@ def main():
docker_client = APIClient(base_url='unix://var/run/docker.sock')

parser = argparse.ArgumentParser(description='Wait for dependent docker services',
version='1.0.0',
formatter_class=argparse.RawTextHelpFormatter,
epilog="""
Examples:
Expand Down