matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[docker-platform-monitor] Install Python 2 'enum34' package to fix Arista platforms (#5779)

Browse Source 
Recent changes to dependencies caused the 'enum34' package to cease being installed for Python 2 in the PMon container. This broke Arista platforms, where the Arista sonic_platform package imports 'enum'. This is because on Arista devices, the sonic_platform wheel is not installed in the container. Instead, the installation directory is mounted from the host OS. However, this method doesn't ensure all dependencies are installed in the container.
This commit is contained in:
Joe LeVeque 2020-11-04 11:23:03 -08:00 committed by GitHub
parent 194c7a97cd
commit ba7fda7fd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dockers/docker-platform-monitor/Dockerfile.j2
View File

@ -21,6 +21,16 @@ RUN apt-get update && \
dmidecode \
i2c-tools
# On Arista devices, the sonic_platform wheel is not installed in the container.
# Instead, the installation directory is mounted from the host OS. However, this method
# doesn't ensure all dependencies are installed in the container. So here we
# install any dependencies required by the Arista sonic_platform package.
# TODO: eliminate the need to install these explicitly.
# NOTE: Only install enum34 for Python 2, as our version of Python 3 is 3.7, which
# contains 'enum' as part of the standard library. Installing enum34 there will
# cause conflicts.
RUN pip2 install enum34
{% if docker_platform_monitor_debs.strip() -%}
# Copy locally-built Debian package dependencies
{{ copy_files("debs/", docker_platform_monitor_debs.split(' '), "/debs/") }}