paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-06 23:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix for the DB_ROOT_PASS missing -

Browse Source
This commit is contained in:
Alexander Trost
2015-10-25 21:11:35 +01:00
parent 36430179df
commit 4b46b0b2cb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
entrypoint.sh
View File

@@ -15,7 +15,7 @@ DB_USER="${DB_USER:-zulip}"
DB_PASSWORD="${DB_PASSWORD:-zulip}" DB_PASSWORD="${DB_PASSWORD:-zulip}"
DB_PASS="${DB_PASS:-$(echo $DB_PASSWORD)}" DB_PASS="${DB_PASS:-$(echo $DB_PASSWORD)}"
DB_ROOT_USER="${DB_ROOT_USER:-postgres}" DB_ROOT_USER="${DB_ROOT_USER:-postgres}"
DB_ROOT_PASS="${DB_ROOT_PASS:$(echo $DB_PASS)}" DB_ROOT_PASS="${DB_ROOT_PASS:-$(echo $DB_PASS)}"
unset DB_PASSWORD unset DB_PASSWORD
# RabbitMQ # RabbitMQ
RABBITMQ_SETUP="${RABBITMQ_SETUP:-True}" RABBITMQ_SETUP="${RABBITMQ_SETUP:-True}"
@@ -372,6 +372,8 @@ bootstrapDatabase() {
echo "Creating tsearch_extras extension ..." echo "Creating tsearch_extras extension ..."
echo "CREATE EXTENSION tsearch_extras SCHEMA $DB_SCHEMA;" | \ echo "CREATE EXTENSION tsearch_extras SCHEMA $DB_SCHEMA;" | \
psql -h "$DB_HOST" -p "$DB_HOST_PORT" -U "$DB_ROOT_USER" "$DB_NAME" || : psql -h "$DB_HOST" -p "$DB_HOST_PORT" -U "$DB_ROOT_USER" "$DB_NAME" || :
else
echo ""
fi fi
unset PGPASSWORD unset PGPASSWORD
echo "Database structure recreated." echo "Database structure recreated."