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

fix deps docker build #26

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix deps docker build #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94577e
fix deps docker build
imcom Sep 29, 2018
0ea8954
ubuntu no longer has ip command installed by default
imcom Sep 29, 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
1 change: 0 additions & 1 deletion base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ def run(self, dckr_net_name='', rm=True):
dckr.start(container=self.name)

if len(ipv4_addresses) > 1:

# get the interface used by the first IP address already added by Docker
dev = None
res = self.local('ip addr')
Expand Down
4 changes: 2 additions & 2 deletions exabgp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def build_image(cls, force=False, tag='bgperf/exabgp', checkout='HEAD', nocache=
FROM ubuntu:latest
WORKDIR /root
RUN apt-get update && apt-get install -qy git python python-setuptools gcc python-dev
RUN easy_install pip
RUN apt-get install -yq python-pip iproute2
RUN git clone https://github.com/Exa-Networks/exabgp && \
(cd exabgp && git checkout {0} && pip install six && pip install -r requirements.txt && python setup.py install)
RUN ln -s /root/exabgp /exabgp
Expand All @@ -49,7 +49,7 @@ def build_image(cls, force=False, tag='bgperf/exabgp_mrtparse', checkout='HEAD',
FROM ubuntu:latest
WORKDIR /root
RUN apt-get update && apt-get install -qy git python python-setuptools gcc python-dev
RUN easy_install pip
RUN apt-get install -yq python-pip iproute2
RUN git clone https://github.com/Exa-Networks/exabgp && \
(cd exabgp && git checkout {0} && pip install six && pip install -r requirements.txt && python setup.py install)
RUN ln -s /root/exabgp /exabgp
Expand Down
9 changes: 3 additions & 6 deletions gobgp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@ def __init__(self, host_dir, conf, image='bgperf/gobgp'):
@classmethod
def build_image(cls, force=False, tag='bgperf/gobgp', checkout='HEAD', nocache=False):
cls.dockerfile = '''
FROM golang:1.6
FROM golang:1.10
WORKDIR /root
RUN go get -v github.com/osrg/gobgp/gobgpd
RUN go get -v github.com/osrg/gobgp/gobgp
RUN cd $GOPATH/src/github.com/osrg/gobgp && git checkout {0}
RUN go install github.com/osrg/gobgp/gobgpd
RUN go install github.com/osrg/gobgp/gobgp
RUN go get -v github.com/osrg/gobgp
RUN go install github.com/osrg/gobgp
'''.format(checkout)
super(GoBGP, cls).build_image(force, tag, nocache)

Expand Down