aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Dockerfile
diff options
context:
space:
mode:
authorPavel Kotucek <pavel.kotucek@pantheon.tech>2019-05-15 11:44:18 +0200
committerPavel Kotucek <pavel.kotucek@pantheon.tech>2019-05-15 11:57:05 +0200
commit338305dd928bde2cfcaab1b133dbb72bcbc5ca08 (patch)
tree13afd66766cb8f335238bb831cf9c01153702aa5 /scripts/Dockerfile
parent8e38dbd3dd5f11e62e9acfed3660c02dc56236b5 (diff)
Docker build improvements
Additional small changes to create dev docker image. Possibility to specify vpp version (master/release) to be used. Change-Id: I2c3ea9df60a9b00fbd158f2d06192f23ecd3ee0b Signed-off-by: Pavel Kotucek <pavel.kotucek@pantheon.tech>
Diffstat (limited to 'scripts/Dockerfile')
-rw-r--r--scripts/Dockerfile8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index b07382c..61085b5 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -1,5 +1,7 @@
FROM ubuntu:18.04
+ARG vpp_version=release
+
# Layer0: Prepare sweetcomb environement by installing sysrepo, netopeer2 & vpp
# Layer1: Install vpp
# Layer2: Install sweetcomb
@@ -16,13 +18,9 @@ RUN rm -rf /opt/dev/*
RUN apt-get install -y \
sudo curl \
inetutils-ping \
- && curl -s https://packagecloud.io/install/repositories/fdio/1904/script.deb.sh | sudo bash \
+ && curl -s https://packagecloud.io/install/repositories/fdio/$vpp_version/script.deb.sh | sudo bash \
&& apt-get -y --force-yes install vpp libvppinfra* vpp-plugin-* vpp-dev
-RUN apt-get update; \
- apt-get install -y clang-format python3-pip; \
- pip3 install pexpect pyroute2 psutil;
-
#Layer2
COPY . /root/src/sweetcomb
WORKDIR /root/src/sweetcomb