You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/07/06 21:31:46 UTC

[incubator-pulsar] branch master updated: Fixed path for Postgres in dashboard docker image (#2088)

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 1ebe334  Fixed path for Postgres in dashboard docker image (#2088)
1ebe334 is described below

commit 1ebe3349d3a185d441e22ad3d9767d0ea39871eb
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Fri Jul 6 14:31:43 2018 -0700

    Fixed path for Postgres in dashboard docker image (#2088)
---
 dashboard/Dockerfile               |  2 +-
 dashboard/conf/postgresql.conf     | 10 +++++-----
 dashboard/conf/supervisor-app.conf |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
index faae137..a00d8b0 100644
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get -y install postgresql python sudo nginx supervisor
 RUN pip install uwsgi 'Django<2.0' psycopg2 pytz requests
 
 # Postgres configuration
-COPY conf/postgresql.conf /etc/postgresql/9.4/main/
+COPY conf/postgresql.conf /etc/postgresql/9.6/main/
 
 # Configure nginx and supervisor
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf
diff --git a/dashboard/conf/postgresql.conf b/dashboard/conf/postgresql.conf
index d35dffa..201dbba 100644
--- a/dashboard/conf/postgresql.conf
+++ b/dashboard/conf/postgresql.conf
@@ -23,16 +23,16 @@ full_page_writes = off
 synchronous_commit = off
 
 # Default configs
-data_directory = '/var/lib/postgresql/9.4/main'
-hba_file = '/etc/postgresql/9.4/main/pg_hba.conf'
-ident_file = '/etc/postgresql/9.4/main/pg_ident.conf'
-external_pid_file = '/var/run/postgresql/9.4-main.pid'
+data_directory = '/var/lib/postgresql/9.6/main'
+hba_file = '/etc/postgresql/9.6/main/pg_hba.conf'
+ident_file = '/etc/postgresql/9.6/main/pg_ident.conf'
+external_pid_file = '/var/run/postgresql/9.6-main.pid'
 
 port = 5432
 max_connections = 100
 
 datestyle = 'iso, mdy'
 default_text_search_config = 'pg_catalog.english'
-stats_temp_directory = '/var/run/postgresql/9.4-main.pg_stat_tmp'
+stats_temp_directory = '/var/run/postgresql/9.6-main.pg_stat_tmp'
 timezone = 'UTC'
 log_timezone = 'UTC'
diff --git a/dashboard/conf/supervisor-app.conf b/dashboard/conf/supervisor-app.conf
index 30ff208..44a918c 100644
--- a/dashboard/conf/supervisor-app.conf
+++ b/dashboard/conf/supervisor-app.conf
@@ -18,7 +18,7 @@
 #
 
 [program:postgres]
-command = /usr/lib/postgresql/9.4/bin/postgres -D /etc/postgresql/9.4/main
+command = /usr/lib/postgresql/9.6/bin/postgres -D /etc/postgresql/9.6/main
 user = postgres
 
 [program:uwsgi]