From d2dc25d1b940bf2a5a5ce572db2de857eed50f47 Mon Sep 17 00:00:00 2001 From: Zhi Yuan Carl Zhao Date: Tue, 30 Jul 2019 16:39:07 -0700 Subject: [PATCH] Add python linuxfd to image and pmon --- dockers/docker-platform-monitor/Dockerfile.j2 | 13 +++++++++++-- files/build_templates/sonic_debian_extension.j2 | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2 index 9a3deebef34a..d85158ae77ff 100755 --- a/dockers/docker-platform-monitor/Dockerfile.j2 +++ b/dockers/docker-platform-monitor/Dockerfile.j2 @@ -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 @@ -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/"] diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index 0f27c15273c1..4d9a2bc920cb 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -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