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.

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

Install netifaces package in sonic-slave docker and sonic image #1353

Merged
merged 29 commits into from
Dec 15, 2018
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0766365
IPv4 prefixes shouldn't be sent by default over IPv6 session with FRR.
Aug 22, 2017
45ab087
RR client support in minigraph for FRR
Aug 27, 2017
c9a2c92
Sync to master
Aug 27, 2017
38a8261
Revert "Sync to master"
Aug 29, 2017
9c69587
Revert "RR client support in minigraph for FRR"
Aug 29, 2017
99300a5
Merge pull request #3 from Azure/master
nikos-github Aug 29, 2017
8aa3ef5
RR client support in minigraph for FRR
Aug 29, 2017
6e2ef2c
Correcting j2 file for rrclient support
Aug 31, 2017
557bb08
Sync to master
nikos-github Oct 4, 2017
bf4d3c3
Merge pull request #4 from Azure/master
nikos-github Oct 4, 2017
745b96d
Remove stale files from sync
nikos-github Oct 4, 2017
adea1da
Fix python warning from previous rrclient commit.
Oct 9, 2017
cc133ea
Fix python warning from previous rrclient commit and move config hand…
Oct 9, 2017
d1e05d8
Fix python warning from previous rrclient commit and move config hand…
Oct 10, 2017
f1eb735
Sync to master
Nov 7, 2017
4a1c7a0
Merge pull request #5 from Azure/master
nikos-github Nov 7, 2017
54e176f
Auto-completion, help (?), cmd navigation (up arrow) not working in v…
Nov 7, 2017
58082cd
Update sonic-quagga submodule
Nov 10, 2017
5707b61
Merge pull request #6 from Azure/master
nikos-github Jan 30, 2018
3de7bb3
show [ip|ipv6] interfaces cmds
Jan 30, 2018
e466050
Install netifaces in sonic-slave and sonic image
Jan 31, 2018
5bf7f4b
Install netifaces package in sonic-slave docker and sonic image
Jan 31, 2018
91dd5b6
Install netifaces package in sonic-slave docker and sonic image
Jan 31, 2018
7cedfea
Install netifaces package in sonic-slave docker and sonic image
Jan 31, 2018
8670c64
Install netifaces package in sonic-slave docker and sonic image
Jan 31, 2018
dc24271
Merge branch 'master' into showip
nikos-github Dec 10, 2018
8a8415b
Install netifaces package in sonic-slave docker and sonic image
Dec 10, 2018
80e7e51
Install netifaces package in sonic-slave docker and sonic image
Dec 10, 2018
b9763c9
Merge branch 'showip' of https://github.com/nikos-github/sonic-buildi…
Dec 15, 2018
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
7 changes: 7 additions & 0 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT easy_install pip
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'docker-py==1.6.0'
## Note: keep pip installed for maintainance purpose

## Get gcc and python dev pkgs
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install gcc libpython2.7-dev
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'netifaces==0.10.6'
nikos-github marked this conversation as resolved.
Show resolved Hide resolved

## Create /var/run/redis folder for docker-database to mount
sudo mkdir -p $FILESYSTEM_ROOT/var/run/redis

Expand Down Expand Up @@ -342,6 +346,9 @@ if [ "${enable_organization_extensions}" = "y" ]; then
fi
fi

## Remove gcc and python dev pkgs
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y remove gcc libpython2.7-dev

## Clean up apt
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoremove
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoclean
Expand Down
2 changes: 1 addition & 1 deletion sonic-slave/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ RUN pip install j2cli
RUN pip install pyangbind==0.5.10

# For sonic utilities testing
RUN pip install click-default-group click natsort tabulate
RUN pip install click-default-group click natsort tabulate netifaces==0.10.6

# For supervisor build
RUN pip install meld3 mock
Expand Down