apt-get clean to get past timeouts

Change-Id: I2774e29a928f17a3003f151822b6c17febfe08c0
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/policy-base/Dockerfile b/policy-base/Dockerfile
index 2d46aba..f1ad243 100644 (file)
--- a/policy-base/Dockerfile
+++ b/policy-base/Dockerfile
@@ -3,9 +3,10 @@ FROM openecomp/policy/policy-os
 
 # install MariaDB client
 RUN \
-        apt-get install -y apt-transport-https && \
+    apt-get install -y apt-transport-https && \
        apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
        add-apt-repository 'deb [arch=amd64,i386,ppc64el] https://mirrors.evowise.com/mariadb/repo/10.1/ubuntu trusty main' && \
+       apt-get clean && \
        apt-get update && \
        apt-get install -y mariadb-client
        

diff --git a/policy-db/Dockerfile b/policy-db/Dockerfile
index a74164d..290d7a0 100644 (file)
--- a/policy-db/Dockerfile
+++ b/policy-db/Dockerfile
@@ -1,9 +1,11 @@
 FROM openecomp/policy/policy-os
 
 RUN \
+       apt-get clean && \
        apt-get install -y apt-transport-https && \
        apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
        add-apt-repository 'deb [arch=amd64,i386,ppc64el] https://mirrors.evowise.com/mariadb/repo/10.1/ubuntu trusty main' && \
+       apt-get clean && \
        apt-get update && \
        apt-get install -y mariadb-server && \
        touch /var/lib/mysql/firstrun

diff --git a/policy-os/Dockerfile b/policy-os/Dockerfile
index 7acbf82..8ae51d9 100644 (file)
--- a/policy-os/Dockerfile
+++ b/policy-os/Dockerfile
@@ -1,11 +1,12 @@
 FROM ubuntu:14.04
 
-#RUN add-apt-repository ppa:openjdk-r/ppa
 RUN \
+       apt-get clean && \
        apt-get update && \
        apt-get install -y zip unzip curl wget ssh telnet maven && \
        apt-get install -y software-properties-common && \
        add-apt-repository ppa:openjdk-r/ppa && \
+       apt-get clean && \
        apt-get update && \
        apt-get install -y openjdk-8-jdk