docker: allow uwsgi opts to be set from env

muccg · Nov 23, 2016 · 106d47f · 106d47f
1 parent 2c0cd01
commit 106d47f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -66,6 +66,7 @@ function defaults {
     : ${KERBEROSPORT:="88"}
     : ${LDAPSERVER:="ldap"}
     : ${LDAPPORT:="389"}
+    : ${UWSGI_OPTS:="--die-on-term --ini /app/uwsgi/docker.ini"}
     : ${YABIURL:="http://$DOCKER_ROUTE:$RUNSERVERPORT/"}
 
     : ${DBUSER:="webapp"}
@@ -159,14 +160,13 @@ fi
 if [ "$1" = 'uwsgi' ]; then
     echo "[Run] Starting uwsgi"
 
-    : ${UWSGI_OPTS="/app/uwsgi/docker.ini"}
     echo "UWSGI_OPTS is ${UWSGI_OPTS}"
 
     _django_collectstatic
     _django_migrate
     _django_check_deploy
 
-    exec uwsgi --die-on-term --ini ${UWSGI_OPTS}
+    exec uwsgi ${UWSGI_OPTS}
 fi
 
 # runserver entrypoint