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

[mgmt-framework]: support python3 in mgmt-framework (#6038)

Browse Source 
Fix specific version for mmh3 for python2 and python3 and Add pyang for python3
This commit is contained in:
faraazbrcm 2020-12-23 01:36:28 +05:30 committed by GitHub
parent ba02209141
commit 9d35fa19dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dockers/docker-sonic-mgmt-framework/Dockerfile.j2
View File

@ -7,15 +7,23 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y g++ python-dev libxml2 apt-get install -y g++ python-dev python3-dev libxml2
RUN pip install connexion==1.1.15 \ RUN pip2 install connexion==1.1.15 \
setuptools==21.0.0 \ setuptools==21.0.0 \
grpcio-tools==1.20.0 \ grpcio-tools==1.20.0 \
certifi==2017.4.17 \ certifi==2017.4.17 \
python-dateutil==2.6.0 \ python-dateutil==2.6.0 \
six==1.11.0 \ six==1.11.0 \
urllib3==1.21.1 urllib3==1.21.1
RUN pip3 install connexion==2.7.0 \
setuptools==21.0.0 \
grpcio-tools==1.20.0 \
certifi==2017.4.17 \
python-dateutil==2.6.0 \
six==1.11.0 \
urllib3==1.21.1
COPY \ COPY \
{% for deb in docker_sonic_mgmt_framework_debs.split(' ') -%} {% for deb in docker_sonic_mgmt_framework_debs.split(' ') -%}
@ -32,7 +40,7 @@ COPY ["start.sh", "rest-server.sh", "/usr/bin/"]
COPY ["mgmt_vars.j2", "/usr/share/sonic/templates/"] COPY ["mgmt_vars.j2", "/usr/share/sonic/templates/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
RUN apt-get remove -y g++ python-dev RUN apt-get remove -y g++ python-dev python3-dev
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
RUN rm -rf /debs RUN rm -rf /debs

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

@ -431,7 +431,9 @@ RUN pip2 install pyang==2.1.1
RUN pip3 install pyang==2.1.1 RUN pip3 install pyang==2.1.1
# For mgmt-framework build # For mgmt-framework build
RUN pip2 install mmh3 RUN pip2 install mmh3==2.5.1
RUN pip3 install mmh3==2.5.1
RUN apt-get install -y xsltproc RUN apt-get install -y xsltproc
# Install dependencies for isc-dhcp-relay build # Install dependencies for isc-dhcp-relay build