Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

changes to support python3 in mgmt-framework #6038

Merged
merged 13 commits into from
Dec 22, 2020
Merged

changes to support python3 in mgmt-framework #6038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3d3856a
Update Dockerfile.j2
faraazbrcm Nov 25, 2020
1ef231c
Merge pull request #1 from faraazbrcm/faraazbrcm-patch-1
faraazbrcm Nov 25, 2020
e4f770e
Python3 support in sonic-mgmt-framework docker
faraazbrcm Nov 25, 2020
6f20f4d
Merge branch 'master' into python3_changes
faraazbrcm Nov 25, 2020
3cb6a24
Update Dockerfile.j2
faraazbrcm Nov 25, 2020
35e48f0
Update Dockerfile.j2
faraazbrcm Nov 25, 2020
8f57937
Update Dockerfile.j2
faraazbrcm Nov 25, 2020
5275f62
Update Dockerfile.j2
faraazbrcm Nov 25, 2020
7e58de5
Update Dockerfile.j2
faraazbrcm Nov 26, 2020
f4cde68
Update Dockerfile.j2
faraazbrcm Nov 26, 2020
1ce8688
Update Dockerfile.j2
faraazbrcm Dec 21, 2020
25a1c6c
Update Dockerfile.j2
faraazbrcm Dec 22, 2020
ed7394a
Update Dockerfile.j2
faraazbrcm Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions dockers/docker-sonic-mgmt-framework/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,23 @@ RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%s
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y g++ python-dev libxml2

RUN pip install connexion==1.1.15 \
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
apt-get install -y g++ python-dev python3-dev libxml2
faraazbrcm marked this conversation as resolved.
Show resolved Hide resolved

RUN pip2 install connexion==1.1.15 \
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

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 \
{% for deb in docker_sonic_mgmt_framework_debs.split(' ') -%}
Expand All @@ -32,7 +40,7 @@ COPY ["start.sh", "rest-server.sh", "/usr/bin/"]
COPY ["mgmt_vars.j2", "/usr/share/sonic/templates/"]
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 rm -rf /debs

Expand Down
5 changes: 4 additions & 1 deletion sonic-slave-buster/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,12 @@ RUN pip3 install Pympler==0.8

# For sonic_yang_model build
RUN pip2 install pyang==2.1.1
RUN pip3 install pyang==2.1.1

# 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

# Install dependencies for isc-dhcp-relay build
Expand Down