Browse Source

Merge pull request #987 from setu4993/fix/shell-script

Bring both run.sh scripts to parity
pull/1007/head
Hiroki Nakayama 4 years ago
committed by GitHub
parent
commit
6d5bff4bd0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
  1. 6
      app/tools/run.sh
  2. 13
      tools/run.sh

6
app/tools/run.sh

@ -3,13 +3,14 @@
set -o errexit
echo "Making staticfiles"
python manage.py collectstatic --noinput
if [[ ! -d "staticfiles" ]]; then python manage.py collectstatic --noinput; fi
echo "Initializing database"
python manage.py wait_for_db
python manage.py migrate
python manage.py create_roles
echo "Creating admin"
if [[ -n "${ADMIN_USERNAME}" ]] && [[ -n "${ADMIN_PASSWORD}" ]] && [[ -n "${ADMIN_EMAIL}" ]]; then
python manage.py create_admin \
--username "${ADMIN_USERNAME}" \
@ -20,4 +21,5 @@ if [[ -n "${ADMIN_USERNAME}" ]] && [[ -n "${ADMIN_PASSWORD}" ]] && [[ -n "${ADMI
fi
echo "Starting django"
gunicorn --bind 0.0.0.0:8000 app.wsgi --timeout 300
gunicorn --bind="0.0.0.0:${PORT:-8000}" --workers="${WORKERS:-1}" app.wsgi --timeout 300

13
tools/run.sh

@ -2,14 +2,23 @@
set -o errexit
echo "Making staticfiles"
if [[ ! -d "app/staticfiles" ]]; then python app/manage.py collectstatic --noinput; fi
echo "Initializing database"
python app/manage.py wait_for_db
python app/manage.py migrate
python app/manage.py create_roles
if [[ -n "${ADMIN_USERNAME}" ]] && [[ -n "${ADMIN_EMAIL}" ]] && [[ -n "${ADMIN_PASSWORD}" ]]; then
python app/manage.py create_admin --noinput --username="${ADMIN_USERNAME}" --email="${ADMIN_EMAIL}" --password="${ADMIN_PASSWORD}"
echo "Creating admin"
if [[ -n "${ADMIN_USERNAME}" ]] && [[ -n "${ADMIN_PASSWORD}" ]] && [[ -n "${ADMIN_EMAIL}" ]]; then
python app/manage.py create_admin \
--username "${ADMIN_USERNAME}" \
--password "${ADMIN_PASSWORD}" \
--email "${ADMIN_EMAIL}" \
--noinput \
|| true
fi
echo "Starting django"
gunicorn --bind="0.0.0.0:${PORT:-8000}" --workers="${WORKERS:-1}" --pythonpath=app app.wsgi --timeout 300
Loading…
Cancel
Save