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.

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

Add python linuxfd to image and pmon #3241

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 11 additions & 2 deletions dockers/docker-platform-monitor/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ RUN apt-get update && \
rrdtool \
python-smbus \
ethtool \
dmidecode
dmidecode \
gcc \
libpython-dev

{% if docker_platform_monitor_debs.strip() -%}
# Copy locally-built Debian package dependencies
Expand All @@ -44,14 +46,21 @@ RUN apt-get update && \
{{ install_python_wheels(docker_platform_monitor_whls.split(' ')) }}
{% endif %}

# Install python dependencies for use by some plugins
RUN pip install --no-cache-dir \
linuxfd==1.4.4

# Clean up
RUN apt-get purge -y \
python-pip && \
python-pip \
gcc \
libpython-dev && \
apt-get clean -y && \
apt-get autoclean -y && \
apt-get autoremove -y && \
rm -rf /debs \
/python-wheels \
/var/lib/apt/lists \
~/.cache

COPY ["docker_init.sh", "lm-sensors.sh", "/usr/bin/"]
Expand Down
3 changes: 3 additions & 0 deletions files/build_templates/sonic_debian_extension.j2
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ sudo rm -rf $FILESYSTEM_ROOT/$CONFIG_ENGINE_WHEEL_NAME
# Install Python client for Redis
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install "redis==2.10.6"

# Install Python linuxfd
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install "linuxfd==1.4.4"

# Install redis-dump-load Python 2 package
REDIS_DUMP_LOAD_PY2_WHEEL_NAME=$(basename {{redis_dump_load_py2_wheel_path}})
sudo cp {{redis_dump_load_py2_wheel_path}} $FILESYSTEM_ROOT/$REDIS_DUMP_LOAD_PY2_WHEEL_NAME
Expand Down