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

Moved some stuff around in the entrypoint.sh

Browse Source 
Removed the "copy settings.py" env var
This commit is contained in:
Alexander Trost
2015-10-18 23:41:15 +02:00
parent 32991a5a9b
commit b085e36fae
2 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -7,7 +7,7 @@ ENV ZULIP_DIR="/home/zulip" ZULIP_VERSION="1.3.6" DATA_DIR="/data" \
REDIS_RATE_LIMITING="True" REDIS_HOST="127.0.0.1" REDIS_PORT="6379" \ 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" \ MEMCACHED_HOST="127.0.0.1" MEMCACHED_PORT="11211" MEMCACHED_TIMEOUT="3600" \
ZULIP_USER_FULLNAME="Zulip Docker" ZULIP_USER_DOMAIN="" ZULIP_USER_EMAIL="" ZULIP_USER_PASSWORD="zulip" \ ZULIP_USER_FULLNAME="Zulip Docker" ZULIP_USER_DOMAIN="" ZULIP_USER_EMAIL="" ZULIP_USER_PASSWORD="zulip" \
ZULIP_COPY_SETTINGS="true" ZULIP_CUSTOM_SETTINGS="" ZULIP_CUSTOM_SETTINGS=""
ADD entrypoint.sh /entrypoint.sh ADD entrypoint.sh /entrypoint.sh
ADD includes/zulip-puppet /root/zulip-puppet ADD includes/zulip-puppet /root/zulip-puppet

48
entrypoint.sh
View File

@@ -87,7 +87,6 @@ EOF
""" | psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" "zulip" || : """ | psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" "zulip" || :
} }
databaseInitiation(){ databaseInitiation(){
su zulip -c "/home/zulip/deployments/current/manage.py checkconfig"
echo "Migrating database ..." echo "Migrating database ..."
su zulip -c "/home/zulip/deployments/current/manage.py migrate --noinput" su zulip -c "/home/zulip/deployments/current/manage.py migrate --noinput"
echo "Creating cache and third_party_api_results table ..." echo "Creating cache and third_party_api_results table ..."
@@ -235,10 +234,6 @@ EOF
echo "Setting key \"$SETTING_KEY\" to value \"$SETTING_VAR\"." echo "Setting key \"$SETTING_KEY\" to value \"$SETTING_VAR\"."
sed -ri "s~#?${SETTING_KEY}[ ]*=[ ]*['\"]+.*['\"]+$~${SETTING_KEY} = '${SETTING_VAR}'~g" "$ZULIP_SETTINGS" sed -ri "s~#?${SETTING_KEY}[ ]*=[ ]*['\"]+.*['\"]+$~${SETTING_KEY} = '${SETTING_VAR}'~g" "$ZULIP_SETTINGS"
done done
if [ "$ZULIP_COPY_SETTINGS" == "true" ]; then
rm -f "$DATA_DIR/settings.py"
cp -fT "$ZULIP_SETTINGS" "$DATA_DIR/settings.py"
fi
unset SETTING_KEY unset SETTING_KEY
if [ -z "$ZULIP_USER_EMAIL" ]; then if [ -z "$ZULIP_USER_EMAIL" ]; then
echo "No zulip user email given." echo "No zulip user email given."
@@ -271,25 +266,25 @@ ln -sfT "$DATA_DIR/uploads" "$ZULIP_DIR/uploads"
chown zulip:zulip -R "$DATA_DIR/uploads" chown zulip:zulip -R "$DATA_DIR/uploads"
# Configure rabbitmq server everytime because it could be a new one ;) # Configure rabbitmq server everytime because it could be a new one ;)
rabbitmqSetup rabbitmqSetup
if [ ! -e "$DATA_DIR/.initiated" ]; then echo "Generating and setting secrets ..."
echo "Initiating Zulip initiation ..." # Generate the secrets
echo "===" /root/zulip/scripts/setup/generate_secrets.py
echo "Generating and setting secrets ..." secretsSetup
# Generate the secrets echo "Secrets generated and set."
/root/zulip/scripts/setup/generate_secrets.py echo "Setting Zulip settings ..."
secretsSetup # Setup zulip settings
echo "Secrets generated and set." if ! zulipSetup; then
echo "Setting Zulip settings ..."
# Setup zulip settings
if ! zulipSetup; then
echo "Zulip setup failed." echo "Zulip setup failed."
exit 1 exit 1
fi fi
echo "Zulip settings setup done." echo "Zulip settings setup done."
echo "Setting up database settings and server ..." echo "Setting up database settings and server ..."
# setup database # setup database
databaseSetup databaseSetup
echo "Database setup done." echo "Database setup done."
echo "Checking zulip config ..."
su zulip -c "/home/zulip/deployments/current/manage.py checkconfig"
if [ ! -e "$DATA_DIR/.initiated" ]; then
echo "Initiating Database ..." echo "Initiating Database ..."
# Init database with something called data :D # Init database with something called data :D
if ! databaseInitiation; then if ! databaseInitiation; then
@@ -297,14 +292,15 @@ if [ ! -e "$DATA_DIR/.initiated" ]; then
exit 1 exit 1
fi fi
echo "Database initiated." echo "Database initiated."
echo "===" echo ""
echo "Zulip initiation done."
touch "$DATA_DIR/.initiated" touch "$DATA_DIR/.initiated"
else
rm -rf /etc/supervisor/conf.d/zulip_postsetup.conf
fi fi
# If there's an "update" available, then JUST DO IT! # If there's an "update" available, then "JUST DO IT!" - Shia Labeouf
if [ ! -e "$DATA_DIR/.zulip-$ZULIP_VERSION" ]; then if [ ! -e "$DATA_DIR/.zulip-$ZULIP_VERSION" ]; then
echo "Starting zulip migration ..." echo "Starting zulip migration ..."
if ! "/home/zulip/deployments/current/manage.py" migrate; then if ! /home/zulip/deployments/current/manage.py migrate; then
echo "Zulip migration error." echo "Zulip migration error."
exit 1 exit 1
fi fi