From: Pamela Dragosh <pdragosh@research.att.com>
Date: Wed, 8 Mar 2017 18:58:22 +0000 (-0500)
Subject: apt-get clean to get past timeouts
X-Git-Tag: v1.1.0~82
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6d4e15f8cf551fbf5c2adf0e583b8cdb9f23e274;p=policy%2Fdocker.git

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 2d46aba8..f1ad2433 100644
--- 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 a74164dd..290d7a02 100644
--- 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 7acbf825..8ae51d98 100644
--- 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