pulsar-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] merlimat closed pull request #2088: Fixed path for Postgres in dashboard docker image
Date Fri, 06 Jul 2018 21:31:45 GMT
merlimat closed pull request #2088: Fixed path for Postgres in dashboard docker image
URL: https://github.com/apache/incubator-pulsar/pull/2088
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
index faae137d24..a00d8b03f9 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 d35dffa4c2..201dbba9da 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 30ff208717..44a918c7b2 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]


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message