diff options
author | Tao Shen <shentao@chinamobile.com> | 2019-04-10 14:37:26 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-04-10 14:37:26 +0000 |
commit | 058677634e6bbce3c0bdc4c954e7a21db1659dc7 (patch) | |
tree | cfc56a2aca37a5128c1a3998253649189a806456 | |
parent | 3651121427d910543df683bf745aa712b051f383 (diff) | |
parent | fae145056e08d99487f4382432dac7ede8b8f529 (diff) |
Merge "Modify uui-server dockerfile to install postgreSQL"
-rw-r--r-- | standalone/src/main/assembly/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
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 |