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

[sonic-slave]: Pin version of m2crypto Python package to 0.36.0 in slave containers (#6163)

Browse Source 
The maintainers of the m2crypto Python package pushed two new versions of the package to PyPI today, version 0.37.0 followed a few hours later by 0.37.1 (https://pypi.org/project/M2Crypto/0.37.1/#history). It appears as though these packages are failing to build/install properly in our image.

The problem was noticed in the Jessie container, where we were not previously explicitly installing the Debian m2crypto package. As part of this PR, I install m2crypto via pip in the Jessie container and pin down the version. I also modified the Stretch and Buster Dockerfiles to install the package vi pip in the same fashion for consistency.
This commit is contained in:
Joe LeVeque 2020-12-08 16:25:54 -08:00 committed by GitHub
parent 275c5cfb07
commit 68febe6228
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sonic-slave-buster/Dockerfile.j2
View File

@ -303,8 +303,6 @@ RUN apt-get update && apt-get install -y \
libevent-dev \
# For libyang
swig \
# For SWI Tools
python-m2crypto \
# For build dtb
device-tree-compiler \
# For sonic-mgmt-framework
@ -444,5 +442,8 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-buster docker-ce-cli=5:18.
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
# Install m2crypto package, needed by SWI tools
RUN pip2 install m2crypto==0.36.0
# Install swi tools
RUN pip2 install git+https://github.com/aristanetworks/swi-tools.git@d51761ec0bb93c73039233f3c01ed48235ffad00

3
sonic-slave-jessie/Dockerfile.j2
View File

@ -357,5 +357,8 @@ RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jess
RUN apt-get -o Acquire::Check-Valid-Until=false update
RUN apt-get -y -o Acquire::Check-Valid-Until=false install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk
# Install m2crypto package, needed by SWI tools
RUN pip install m2crypto==0.36.0
# Install swi tools
RUN python -m pip install git+https://github.com/aristanetworks/swi-tools.git@d51761ec0bb93c73039233f3c01ed48235ffad00

5
sonic-slave-stretch/Dockerfile.j2
View File

@ -290,8 +290,6 @@ RUN apt-get update && apt-get install -y \
libevent-dev \
# For libyang
swig \
# For SWI Tools
python-m2crypto \
# For sonic-mgmt-framework
autoconf \
m4 \
@ -438,5 +436,8 @@ RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian
{%- endif %}
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker
# Install m2crypto package, needed by SWI tools
RUN pip install m2crypto==0.36.0
# Install swi tools
RUN pip2 install git+https://github.com/aristanetworks/swi-tools.git@d51761ec0bb93c73039233f3c01ed48235ffad00