From a7a7c99b7719a33bc95c957d6a8904a8968dc6b4 Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Fri, 6 Nov 2015 13:14:20 +0100 Subject: [PATCH] Generate the static files in the entrypoint.sh --- Dockerfile | 2 -- entrypoint.sh | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ecfda44..1ef4ad9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,8 +29,6 @@ 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/current" && \ ln -nsf /etc/zulip/settings.py "$ZULIP_DEPLOY_PATH/zproject/local_settings.py" && \ - /root/zulip/tools/update-prod-static && \ - cp -rfT "$ZULIP_DEPLOY_PATH/prod-static/serve" "/home/zulip/prod-static" && \ chown -R zulip:zulip /home/zulip /var/log/zulip /etc/zulip/settings.py && \ apt-get -qq autoremove --purge -y && \ apt-get -qq clean && \ diff --git a/entrypoint.sh b/entrypoint.sh index 61b939b..491461c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -406,6 +406,13 @@ zulipFirstStartInit() { echo "First Start Init not needed." return 0 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 if ! su zulip -c "/home/zulip/deployments/current/manage.py migrate --noinput"; then local RETURN_CODE=$?