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

Added env vars: MANUAL_CONFIGURATION and LINK_SETTINGS_TO_DATA

Browse Source 
The default is now to not link the settings folder to the data volume
This commit is contained in:
Alexander Trost
2017-03-21 17:24:10 +01:00
parent 6d3f30d0c8
commit 91820cffaa
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -33,12 +33,12 @@ RUN apt-get -q update && \
COPY includes/supervisor/conf.d/zulip_postsetup.conf /etc/supervisor/conf.d/zulip_postsetup.conf COPY includes/supervisor/conf.d/zulip_postsetup.conf /etc/supervisor/conf.d/zulip_postsetup.conf
COPY includes/createZulipAdmin.sh /opt/createZulipAdmin.sh COPY includes/createZulipAdmin.sh /opt/createZulipAdmin.sh
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /sbin/entrypoint.sh
RUN chown zulip:zulip /opt/createZulipAdmin.sh RUN chown zulip:zulip /opt/createZulipAdmin.sh
VOLUME ["$DATA_DIR"] VOLUME ["$DATA_DIR"]
EXPOSE 80 443 EXPOSE 80 443
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/sbin/entrypoint.sh"]
CMD ["app:run"] CMD ["app:run"]

14
docker-entrypoint.sh
View File

@@ -59,6 +59,8 @@ AUTO_BACKUP_ENABLED="${AUTO_BACKUP_ENABLED:-True}"
AUTO_BACKUP_INTERVAL="${AUTO_BACKUP_INTERVAL:-30 3 * * *}" AUTO_BACKUP_INTERVAL="${AUTO_BACKUP_INTERVAL:-30 3 * * *}"
# Zulip configuration function specific variable(s) # Zulip configuration function specific variable(s)
SPECIAL_SETTING_DETECTION_MODE="${SPECIAL_SETTING_DETECTION_MODE:-True}" SPECIAL_SETTING_DETECTION_MODE="${SPECIAL_SETTING_DETECTION_MODE:-True}"
MANUAL_CONFIGURATION="${MANUAL_CONFIGURATION:-false}"
LINK_SETTINGS_TO_DATA="${LINK_SETTINGS_TO_DATA:-false}"
# entrypoint.sh specific variable(s) # entrypoint.sh specific variable(s)
ZPROJECT_SETTINGS="/home/zulip/deployments/current/zproject/settings.py" ZPROJECT_SETTINGS="/home/zulip/deployments/current/zproject/settings.py"
SETTINGS_PY="/etc/zulip/settings.py" SETTINGS_PY="/etc/zulip/settings.py"
@@ -88,21 +90,19 @@ prepareDirectories() {
rm -rf /home/zulip/uploads rm -rf /home/zulip/uploads
ln -sfT "$DATA_DIR/uploads" /home/zulip/uploads ln -sfT "$DATA_DIR/uploads" /home/zulip/uploads
chown zulip:zulip -R "$DATA_DIR/uploads" chown zulip:zulip -R "$DATA_DIR/uploads"
# Link settings folder
if [ "$LINK_SETTINGS_TO_DATA" == "True" ] || [ "$LINK_SETTINGS_TO_DATA" == "true" ]; then
# Create settings directories # Create settings directories
if [ ! -d "$DATA_DIR/settings" ]; then if [ ! -d "$DATA_DIR/settings" ]; then
mkdir -p "$DATA_DIR/settings" mkdir -p "$DATA_DIR/settings"
fi fi
# Link settings folder
if [ ! -d "$DATA_DIR/settings/etc-zulip" ]; then if [ ! -d "$DATA_DIR/settings/etc-zulip" ]; then
cp -rf /etc/zulip "$DATA_DIR/settings/etc-zulip" cp -rf /etc/zulip "$DATA_DIR/settings/etc-zulip"
else
if [ -h "$DATA_DIR/settings/etc-zulip" ]; then
rm -rf "$DATA_DIR/settings/etc-zulip"
fi
fi fi
# Link /etc/zulip/ settings folder # Link /etc/zulip/ settings folder
rm -rf /etc/zulip rm -rf /etc/zulip
ln -sfT "$DATA_DIR/settings/etc-zulip" /etc/zulip ln -sfT "$DATA_DIR/settings/etc-zulip" /etc/zulip
fi
echo "Prepared and linked the uploads directory." echo "Prepared and linked the uploads directory."
} }
setConfigurationValue() { setConfigurationValue() {
@@ -338,10 +338,12 @@ initialConfiguration() {
prepareDirectories prepareDirectories
nginxConfiguration nginxConfiguration
configureCerts configureCerts
secretsConfiguration
databaseConfiguration databaseConfiguration
if [ "$MANUAL_CONFIGURATION" == "False" ] || [ "$MANUAL_CONFIGURATION" == "false" ]; then
secretsConfiguration
authenticationBackends authenticationBackends
zulipConfiguration zulipConfiguration
fi
autoBackupConfiguration autoBackupConfiguration
echo "=== End Initial Configuration Phase ===" echo "=== End Initial Configuration Phase ==="
} }