summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2019-04-10 22:04:10 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-10 22:04:10 +0000
commit120a0dedc64511e41a8be2208d3b9d4322b9f5aa (patch)
tree2a88472eef4ddedd72958078103bb289e38ae68e
parent058677634e6bbce3c0bdc4c954e7a21db1659dc7 (diff)
parent152ed52e54ebd31d936a678405daf819281511c9 (diff)
Merge "Modify dockerfile to add postgreSQL PGP key"
-rw-r--r--standalone/src/main/assembly/Dockerfile7
1 files changed, 4 insertions, 3 deletions
diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile
index fe73b475..eb17387b 100644
--- a/standalone/src/main/assembly/Dockerfile
+++ b/standalone/src/main/assembly/Dockerfile
@@ -12,9 +12,10 @@ ENV PG_HOME=/etc/postgresql \
PG_USR_LIB=/usr/lib/postgresql \
PG_LOGDIR=/var/log/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
+# Add the PostgreSQL PGP key to verify their Debian packages
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
+# Add PostgreSQL's repository
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
# Update the Ubuntu and install tools
RUN apt-get update && \