Skip to content

Commit

Permalink
Fixed path for Postgres in dashboard docker image (apache#2088)
Browse files Browse the repository at this point in the history
  • Loading branch information
merlimat authored Jul 6, 2018
1 parent 7bfc343 commit 1ebe334
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dashboard/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions dashboard/conf/postgresql.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion dashboard/conf/supervisor-app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 1ebe334

Please sign in to comment.