paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-03 21:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Several fixes for wrongly replaced env vars

Browse Source
This commit is contained in:
Alexander Trost
2015-10-21 22:24:15 +02:00
parent 8d356c343e
commit 192793cf36
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
entrypoint.sh
View File

@@ -74,6 +74,9 @@ databaseSetup(){
echo "No DB_PASS given."
exit 2
fi
if [ -z "$DB_HOST_PORT" ]; then
export DB_HOST_PORT="5432"
fi
cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
from zerver.lib.db import TimeTrackingConnection
@@ -86,6 +89,7 @@ DATABASES = {
'USER': '$DB_USER',
'PASSWORD': '$DB_PASS',
'HOST': '$DB_HOST',
'PORT': '$DB_HOST_PORT',
'SCHEMA': 'zulip',
'CONN_MAX_AGE': 600,
'OPTIONS': {
@@ -98,9 +102,6 @@ EOF
if [ -z "$PGPASSWORD" ]; then
export PGPASSWORD="$DB_PASS"
fi
if [ -z "$DB_HOST_PORT" ]; then
export DB_HOST_PORT="5432"
fi
local timeout=60
echo -n "Waiting for database server to allow connections"
while ! /usr/bin/pg_isready -h "$DB_HOST" -p "$DB_HOST_PORT" -U "$DB_USER" -t 1 >/dev/null 2>&1
@@ -113,7 +114,7 @@ EOF
echo -n "."
sleep 1
done
sed -i "s~psycopg2.connect(\"user=zulip\")~psycopg2.connect(\"host=$DB_HOST port=$DB_HOST_PORT dbname=$DB_NAME user=$DB_USER password=$DB_PASS\")~g" "/usr/local/bin/process_fts_updates"
sed -i "s~psycopg2.connect\(.*\)~psycopg2.connect(\"host=$DB_HOST port=$DB_HOST_PORT dbname=$DB_NAME user=$DB_USER password=$DB_PASS\")~g" "/usr/local/bin/process_fts_updates"
echo """
CREATE USER zulip;
ALTER ROLE zulip SET search_path TO zulip,public;
@@ -287,7 +288,7 @@ EOF
cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
RATE_LIMITING = $REDIS_RATE_LIMITING
REDIS_HOST = '$REDIS_HOST'
REDIS_HOST_PORT = $REDIS_HOST_PORT
REDIS_PORT = $REDIS_HOST_PORT
EOF
# Camo settings
if [ ! -z "$CAMO_KEY" ]; then