X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fdisk-image-builder%2Fcsit-sut-dcr%2Fubuntu_1804_amd64%2FDockerfile;h=a681c21e4fb15f26eac547ec3f61b055cb798900;hb=bf3ce71ec5074eb30a866ea8b6e01aad03d58e64;hp=343ac1ba2d6ae5ee6d01d1622574b45fedf539d2;hpb=ccabfb04a4982c89d70b8bfbff67cc97438aad88;p=csit.git

diff --git a/resources/tools/disk-image-builder/csit-sut-dcr/ubuntu_1804_amd64/Dockerfile b/resources/tools/disk-image-builder/csit-sut-dcr/ubuntu_1804_amd64/Dockerfile
index 343ac1ba2d..a681c21e4f 100644
--- a/resources/tools/disk-image-builder/csit-sut-dcr/ubuntu_1804_amd64/Dockerfile
+++ b/resources/tools/disk-image-builder/csit-sut-dcr/ubuntu_1804_amd64/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -14,8 +14,8 @@
 FROM ubuntu:bionic-20180821
 
 MAINTAINER csit-dev <csit-dev@lists.fd.io>
-LABEL Description="CSIT vpp-device ubuntu 18.04 baseline image"
-LABEL Version="0.3"
+LABEL Description="CSIT vpp-device ubuntu 18.04 baseline image (x86)"
+LABEL Version="0.6"
 
 # Setup the environment
 ENV DEBIAN_FRONTEND=noninteractive
@@ -79,6 +79,9 @@ RUN apt-get -q update \
         libmbedtls10 \
         libmbedx509-0 \
         libnuma1 \
+        python-cffi \
+        python-enum34 \
+        python3-cffi \
  && rm -rf /var/lib/apt/lists/*
 
 # Configure locales
@@ -94,20 +97,31 @@ RUN mkdir -p /tmp/dumps \
  && mkdir -p /var/cache/vpp/python \
  && mkdir -p /var/run/sshd
 
-# PIP pre-cache
+# CSIT PIP pre-cache
 RUN pip install \
-        robotframework==2.9.2 \
-        paramiko==1.16.0 \
-        scp==0.10.2 \
+        docopt==0.6.2 \
+        ecdsa==0.13 \
+        enum34==1.1.2 \
         ipaddress==1.0.16 \
-        PyYAML==3.11 \
+        paramiko==1.16.0 \
+        pexpect==4.6.0 \
+        pycrypto==2.6.1 \
         pykwalify==1.5.0 \
-        scapy==2.3.1 \
-        enum34==1.1.2 \
+        pypcap==1.1.5 \
+        python-dateutil==2.4.2 \
+        PyYAML==3.11 \
         requests==2.9.1 \
-        ecdsa==0.13 \
-        pycrypto==2.6.1 \
-        pypcap==1.1.5
+        robotframework==2.9.2 \
+        scapy==2.3.1 \
+        scp==0.10.2 \
+        six==1.12.0 \
+        dill==0.2.8.2 \
+        numpy==1.14.5 \
+        scipy==1.1.0
+
+# VPP PIP pre-cache
+RUN pip install \
+        aenum
 
 # SSH settings
 RUN echo 'root:Csit1234' | chpasswd \