From: zhangab <zhanganbing@chinamobile.com>
Date: Wed, 10 Apr 2019 14:23:42 +0000 (+0800)
Subject: Modify uui-server dockerfile to install postgreSQL
X-Git-Tag: 2.0.0~18^2~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F84889%2F1;p=usecase-ui%2Fserver.git

Modify uui-server dockerfile to install postgreSQL

Change-Id: Ia8710cc9e890b9bc7e5c5b1682d3e077e49a6860
Issue-ID: USECASEUI-236
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
---

diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile
index 9d80e0ee..fe73b475 100644
--- a/standalone/src/main/assembly/Dockerfile
+++ b/standalone/src/main/assembly/Dockerfile
@@ -14,8 +14,7 @@ ENV PG_HOME=/etc/postgresql \
 
 # Install PostgreSQL 9.5
 RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
-    echo 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' > /etc/apt/sources.list.d/pgdg.list && \
-    apt-get -y -q install postgresql-${PG_VERSION} postgresql-client-${PG_VERSION} postgresql-contrib-${PG_VERSION}
+    echo 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' > /etc/apt/sources.list.d/pgdg.list
 
 # Update the Ubuntu and install tools
 RUN apt-get update && \
@@ -25,7 +24,8 @@ RUN apt-get update && \
     apt-get install -y vim && \
     apt-get install -y build-essential && \
     apt-get install -y libssl-dev && \
-    apt-get install -y libffi-dev
+    apt-get install -y libffi-dev && \
+    apt-get -y -q install postgresql-${PG_VERSION} postgresql-client-${PG_VERSION} postgresql-contrib-${PG_VERSION}
 
 # Adjust PostgreSQL configuration
 RUN echo "host all all 0.0.0.0/0 md5" >> ${PG_HOME}/${PG_VERSION}/main/pg_hba.conf