diff options
| author |   YohanPipereau <ypiperea@cisco.com> | 2019-04-26 13:15:56 +0200 |
|---|---|---|
| committer | YohanPipereau <ypiperea@cisco.com> | 2019-04-26 15:28:53 +0200 |
| commit | 9ab1c9c9bd83c971971d3fe5ddf4151717847bf5 (patch) | |
| tree | 2b6c570a80981b1dfeca1cc34c6d5b9b4a44a4d9 /Dockerfile | |
| parent | 0d9d6a9a4446743cc9ac601a76b7e8594c3600ec (diff) | |
This patch fixes docker env and dependencies
-Modify Dockerfile to build our own image of sysrepo with netopeer2
-Add missing pkg-config dependency to compile netopeer2 from ubuntu
-Fix typo in makefile for LIBSSH dependency
-Install protobuf then grpc in install-dep-gnmi-extra in Makefile
Change-Id: I5b8a64cc29cf67f7dd7ff439f80ea77844632435
Signed-off-by: YohanPipereau <ypiperea@cisco.com>
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -1,14 +1,18 @@ -FROM sysrepo/sysrepo-netopeer2:v0.7.7 +FROM ubuntu:18.04 -# Layer1: Prepare sweetcomb environement by installing sysrepo, netopeer2 & vpp +# Layer0: Prepare sweetcomb environement by installing sysrepo, netopeer2 & vpp +# Layer1: Install vpp # Layer2: Install sweetcomb - -#Clean sysrepo previous build because they forgot to do it +#Layer 0 +RUN mkdir -p /opt/dev && apt-get update && apt-get install -y build-essential sudo +COPY . /opt/dev +WORKDIR /opt/dev +RUN make install-dep && make install-dep-extra RUN rm -rf /opt/dev/* -#Install VPP -RUN apt-get update && apt-get install -y \ +#Layer1 +RUN apt-get install -y \ #build utils sudo curl \ #test utils @@ -16,7 +20,7 @@ RUN apt-get update && apt-get install -y \ && curl -s https://packagecloud.io/install/repositories/fdio/1904/script.deb.sh | sudo bash \ && apt-get -y --force-yes install vpp libvppinfra* vpp-plugin-* vpp-dev -# Install sweetcomb +#Layer2 COPY . /root/src/sweetcomb WORKDIR /root/src/sweetcomb |