From 05d1e18373779df333d1f1fa30cc4891a8da59a4 Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Fri, 26 Jul 2019 12:48:41 -0400
Subject: Cleanup POMs and Dockerfiles

Issue-ID: OPTFRA-539

Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-database/src/main/docker/Dockerfile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'cmso-database/src/main/docker')

diff --git a/cmso-database/src/main/docker/Dockerfile b/cmso-database/src/main/docker/Dockerfile
index 8837ee7..f1e617b 100644
--- a/cmso-database/src/main/docker/Dockerfile
+++ b/cmso-database/src/main/docker/Dockerfile
@@ -3,24 +3,26 @@ FROM ubuntu:16.04
 MAINTAINER "The Onap Team"
 LABEL Description="This image contains ubuntu 16.04 with the openjdk installed" Version="16.04-8"
 ENV APP_HOME=/opt/app/cmso-dbinit
-ARG http_proxy
-ARG https_proxy
-ENV HTTP_PROXY=$http_proxy
-ENV HTTPS_PROXY=$https_proxy
+
+ARG http_proxy_arg
+ARG https_proxy_arg
+ENV HTTP_PROXY=$http_proxy_arg
+ENV HTTPS_PROXY=$https_proxy_arg
 ENV http_proxy=$HTTP_PROXY
 ENV https_proxy=$HTTPS_PROXY
 
 RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true &&  \
     apt-get update &&  \
     apt-get -y dist-upgrade &&  \
-    apt-get install -y openjdk-8-jre-headless
+    apt-get install -y openjdk-8-jre-headless && \
+	apt-get install -y curl
 
 COPY onap-cmso/docker-liquibase.jar ${APP_HOME}/app.jar
 COPY onap-cmso/startService.sh ${APP_HOME}/startService.sh
 
-RUN chmod 700 ${APP_HOME}/startService.sh
-RUN ln -s /share/etc ${APP_HOME}/etc
-RUN ln -s /share/logs ${APP_HOME}/logs
+RUN chmod 700 ${APP_HOME}/startService.sh && \
+    ln -s /share/etc ${APP_HOME}/etc && \
+    ln -s /share/logs ${APP_HOME}/logs
 
 VOLUME /share/etc
 VOLUME /share/logs
-- 
cgit 1.2.3-korg