X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fdisk-image-builder%2Fubuntu%2Frun-listmaker.sh;h=4702448574022f052d98eb676bfe3e64e8385fc5;hp=1f476566af64f9e7407a4f3c90d20b1a36588ace;hb=edd554cdb32b124136f49cb17f711ecda0f0176c;hpb=9ac28a0341f378009bd0af9d8a80ed86463f085f;ds=sidebyside

diff --git a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
index 1f476566af..4702448574 100755
--- a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
+++ b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
@@ -49,9 +49,11 @@ echo "Storinging data in ${OUTPUT_DIR}/."
 
 APT_WANTLIST_INFRA="nfs-common cloud-init"
 APT_WANTLIST_CSIT="python-dev python-virtualenv git"
-APT_WANTLIST_VPP="dkms"
+APT_WANTLIST_VPP="dkms bridge-utils"
 APT_WANTLIST_TREX="zlib1g-dev unzip"
 APT_WANTLIST_NESTED="qemu-system-x86"
+APT_WANTLIST_JAVA="openjdk-8-jdk-headless"
+APT_WANTLIST_DOCKER="docker-engine"
 
 # For now, let us NOT incude WANTLIST_NESTED in the below. We're installing qemu
 # separately from a separate source.
@@ -186,6 +188,24 @@ do_ssh apt-get --allow-unauthenticated update
 do_ssh apt-get --print-uris --allow-unauthenticated -y install $APT_WANTLIST_NESTED >> $APT_TEMPFILE
 do_ssh DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated -y install $APT_WANTLIST_NESTED
 
+### Install Java ($APT_WANTLIST_JAVA) separately from PPA
+do_ssh "cat - >> /etc/apt/sources.list" <<_EOF
+# For java
+deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main
+_EOF
+do_ssh apt-get --allow-unauthenticated update
+do_ssh apt-get --print-uris --allow-unauthenticated -y install $APT_WANTLIST_JAVA >> $APT_TEMPFILE
+do_ssh DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated -y install $APT_WANTLIST_JAVA
+
+### Install Docker ($APT_WANTLIST_DOCKER) separately from PPA
+do_ssh "cat - >> /etc/apt/sources.list" <<_EOF
+# For Docker
+deb https://apt.dockerproject.org/repo ubuntu-trusty main
+_EOF
+do_ssh apt-get --allow-unauthenticated update
+do_ssh apt-get --print-uris --allow-unauthenticated -y install $APT_WANTLIST_DOCKER >> $APT_TEMPFILE
+do_ssh DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated -y install $APT_WANTLIST_DOCKER
+
 cat $APT_TEMPFILE | grep MD5Sum | sort > $APT_OUTPUTFILE
 rm -f $APT_TEMPFILE