Install sonic-platform-common package in platform-monitor docker for …

…ledd (#1330) * Install sonic-platform-common package in platform-monitor docker for ledd * Specify Python wheel dependencies in docker-platform-monitor.mk; Remove explicit specifications from Dockerfile.j2
sonic-net · Jan 22, 2018 · ab26a5c · ab26a5c
1 parent 5e01fb3
commit ab26a5c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 31 deletions.
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -9,44 +9,30 @@ RUN apt-get update
 # Install required packages
 RUN apt-get install -y python-pip sensord fancontrol
 
-{% if docker_platform_monitor_debs.strip() %}
-# Copy built Debian packages
-COPY \
-{% for deb in docker_platform_monitor_debs.split(' ') -%}
+{% if docker_platform_monitor_debs.strip() -%}
+# Copy all locally-built Debian package dependencies
+COPY{{' '}}
+{%- for deb in docker_platform_monitor_debs.split(' ') -%}
 debs/{{ deb }}{{' '}}
 {%- endfor -%}
-debs/
-{%- endif %}
+/debs/
 
-{% if docker_platform_monitor_debs.strip() %}
-# Install built Debian packages
-RUN dpkg -i \
-{% for deb in docker_platform_monitor_debs.split(' ') -%}
-debs/{{ deb }}{{' '}}
-{%- endfor %}
-{%- endif %}
+# Install all locally-built Debian package dependencies
+# and implicitly install their dependencies
+RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /debs/*.deb
+{% endif %}
 
-{% if docker_platform_monitor_whls.strip() %}
-# Copy built Python wheels
-COPY \
-{% for whl in docker_platform_monitor_whls.split(' ') -%}
+{% if docker_platform_monitor_whls.strip() -%}
+# Copy all locally-built Python wheel dependencies
+COPY{{' '}}
+{%- for whl in docker_platform_monitor_whls.split(' ') -%}
 python-wheels/{{ whl }}{{' '}}
 {%- endfor -%}
-python-wheels/
-{%- endif %}
-
-{% if docker_platform_monitor_whls.strip() %}
-# Install built Python wheels
-RUN pip install \
-{% for whl in docker_platform_monitor_whls.split(' ') -%}
-python-wheels/{{ whl }}{{' '}}
-{%- endfor %}
-{%- endif %}
-
-COPY python-wheels /python-wheels
+/python-wheels/
 
-# Install Python SwSS SDK (dependency of sonic-ledd)
-RUN pip install /python-wheels/swsssdk-2.0.1-py2-none-any.whl
+# Install all locally-built Python wheel dependencies
+RUN pip install /python-wheels/*.whl
+{% endif %}
 
 # Clean up
 RUN apt-get remove -y python-pip

diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
@@ -3,6 +3,8 @@
 DOCKER_PLATFORM_MONITOR = docker-platform-monitor.gz
 $(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/docker-platform-monitor
 $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(SONIC_LEDD)
+$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
+$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
 $(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_PLATFORM_MONITOR)