Skip to content

Fixes #105: Update configuration to allow additional settings to be loaded #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fixes #105: Update configuration to allow additional settings to be loaded #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71ca6b1
Issue #105: Update include_if_exists entry in configuration
matthewfranglen Jan 22, 2016
67f95e6
Issue #105: Add include_if_exists entry in configuration
matthewfranglen Jan 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 9.2/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ if [ "$1" = 'postgres' ]; then
# look specifically for PG_VERSION, as it is expected in the DB dir
if [ ! -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb
{ echo; echo "include_if_exists = '/etc/postgres/postgresql.conf'"; } >> "$PGDATA/postgresql.conf"

# check password first so we can output the warning before postgres
# messes it up
Expand Down
1 change: 1 addition & 0 deletions 9.3/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ if [ "$1" = 'postgres' ]; then
# look specifically for PG_VERSION, as it is expected in the DB dir
if [ ! -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb
sed -i "s|^#include_if_exists = 'exists.conf'|include_if_exists = '/etc/postgres/postgresql.conf'|" "$PGDATA/postgresql.conf"

# check password first so we can output the warning before postgres
# messes it up
Expand Down
1 change: 1 addition & 0 deletions 9.4/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ if [ "$1" = 'postgres' ]; then
# look specifically for PG_VERSION, as it is expected in the DB dir
if [ ! -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb
sed -i "s|^#include_if_exists = 'exists.conf'|include_if_exists = '/etc/postgres/postgresql.conf'|" "$PGDATA/postgresql.conf"

# check password first so we can output the warning before postgres
# messes it up
Expand Down
1 change: 1 addition & 0 deletions 9.5/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ if [ "$1" = 'postgres' ]; then
# look specifically for PG_VERSION, as it is expected in the DB dir
if [ ! -s "$PGDATA/PG_VERSION" ]; then
gosu postgres initdb
sed -i "s|^#include_if_exists = 'exists.conf'|include_if_exists = '/etc/postgres/postgresql.conf'|" "$PGDATA/postgresql.conf"

# check password first so we can output the warning before postgres
# messes it up
Expand Down