paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-02 04:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added forgotten database settings part

Browse Source
This commit is contained in:
Alexander Trost
2015-10-07 14:40:41 +02:00
parent 285bbe69d7
commit 0674e8f848
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -3,7 +3,7 @@ FROM ubuntu:trusty
MAINTAINER Alexander Trost <galexrt@googlemail.com>
ENV ZULIP_DIR="/home/zulip" ZULIP_VERSION="1.3.6" DATA_DIR="/data" \
DB_HOST="127.0.0.1" DB_PORT="5432" DB_USER="zulip" DB_PASSWORD="zulip" \
DB_HOST="127.0.0.1" DB_PORT="5432" DB_USER="zulip" DB_PASSWORD="zulip" DB_NAME="zulip" \
RABBITMQ_USERNAME="zulip" RABBITMQ_PASSWORD="zulip"\
REDIS_RATE_LIMITING="True" REDIS_HOST="127.0.0.1" REDIS_PORT="6379" \
MEMCACHED_HOST="127.0.0.1" MEMCACHED_PORT="11211" MEMCACHED_TIMEOUT="3600" \

35
entrypoint.sh
View File

@@ -12,34 +12,35 @@ ZULIP_SETTINGS="/etc/zulip/settings.py"
# Some functions were originally taken from the zulip/zulip repo folder scripts
# I modified them to fit the "docker way" of installation ;)
function database-settings-setup(){
# TODO See ZULIP/zproject/settings.py Line: ~284
# cat << > /EOFDATABASES = {"default": {
# 'ENGINE': 'django.db.backends.postgresql_psycopg2',
# 'NAME': 'zulip',
# 'USER': 'zulip',
# 'PASSWORD': '', # Authentication done via certificates
# 'HOST': '', # Host = '' => connect through a local socket
# 'SCHEMA': 'zulip',
# 'CONN_MAX_AGE': 600,
# 'OPTIONS': {
# 'connection_factory': TimeTrackingConnection
# },
# },
# }
cat <<EOF >> "$ZULIP_SETTINGS"
DATABASES = {"default": {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': '$DB_NAME',
'USER': '$DB_USER',
'PASSWORD': '$DB_PASSWORD', # Authentication done via certificates
'HOST': '$DB_HOST',
'SCHEMA': 'zulip',
'CONN_MAX_AGE': 600,
'OPTIONS': {
'connection_factory': TimeTrackingConnection
},
},
}
EOF
}
function database-setup(){
if [ -z "$PGPASSWORD" ]; then
export PGPASSWORD="$DB_PASSWORD"
fi
# TODO Shall we change that and really create the database here or are we expecting a ready zulip database?
psql -h "$DB_HOST" -p "$DB_PORT" -u "$DB_USER" "CREATE USER zulip;
ALTER ROLE zulip SET search_path TO zulip,public;
DROP DATABASE IF EXISTS zulip;
CREATE DATABASE zulip OWNER=zulip;"
psql -h "$DB_HOST" -p "$DB_PORT" -u "$DB_USER" zulip "CREATE SCHEMA zulip AUTHORIZATION zulip;
CREATE DATABASE zulip OWNER=zulip;" || :
psql -h "$DB_HOST" -p "$DB_PORT" -u "$DB_USER" "zulip" "CREATE SCHEMA zulip AUTHORIZATION zulip;
CREATE EXTENSION tsearch_extras SCHEMA zulip;" || :
}
function database-initiation(){
cd "$ZULIP_CURRENT_DEPLOY"
su zulip -c "$MANAGE_PY checkconfig"
su zulip -c "$MANAGE_PY migrate --noinput"
su zulip -c "$MANAGE_PY createcachetable third_party_api_results"