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

"Generate" the prod-static files in the Dockerfile

Browse Source 
The zulip script update-prod-static isn't working, so we have to download a tarball and use the prod-static files folder
This commit is contained in:
Alexander Trost
2015-11-07 14:42:07 +01:00
parent 41716bc806
commit 3b522e7d75
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -29,6 +29,9 @@ RUN wget -q -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc &&
ln -nsf "$ZULIP_DEPLOY_PATH" "/home/zulip/deployments/next" && \ ln -nsf "$ZULIP_DEPLOY_PATH" "/home/zulip/deployments/next" && \
ln -nsf "$ZULIP_DEPLOY_PATH" "/home/zulip/deployments/current" && \ ln -nsf "$ZULIP_DEPLOY_PATH" "/home/zulip/deployments/current" && \
ln -nsf /etc/zulip/settings.py "$ZULIP_DEPLOY_PATH/zproject/local_settings.py" && \ ln -nsf /etc/zulip/settings.py "$ZULIP_DEPLOY_PATH/zproject/local_settings.py" && \
wget https://www.zulip.com/dist/releases/zulip-server-latest.tar.gz -O /tmp/zulip-server.tar.gz && \
tar xfz zulip-server.tar.gz -C "/home/zulip/prod-static" --strip-components=3 --wildcards */prod-static/serve && \
rm -rf /tmp/zulip-server.tar.gz && \
chown -R zulip:zulip /home/zulip /var/log/zulip /etc/zulip/settings.py && \ chown -R zulip:zulip /home/zulip /var/log/zulip /etc/zulip/settings.py && \
apt-get -qq autoremove --purge -y && \ apt-get -qq autoremove --purge -y && \
apt-get -qq clean && \ apt-get -qq clean && \

7
entrypoint.sh
View File

@@ -406,13 +406,6 @@ zulipFirstStartInit() {
echo "First Start Init not needed." echo "First Start Init not needed."
return 0 return 0
fi fi
if [ ! -d "/home/zulip/prod-static" ] || [ "$(ls -A "/home/zulip/prod-static/")" ]; then
echo "Generating static files ..."
/root/zulip/tools/update-prod-static
mkdir -f "/home/zulip/prod-static"
cp -rfT "$ZULIP_DEPLOY_PATH/prod-static/serve" "/home/zulip/prod-static"
echo "Static files generated."
fi
set +e set +e
if ! su zulip -c "/home/zulip/deployments/current/manage.py migrate --noinput"; then if ! su zulip -c "/home/zulip/deployments/current/manage.py migrate --noinput"; then
local RETURN_CODE=$? local RETURN_CODE=$?