From 106d47f278f6502222f74c27988f2dd4e24c866a Mon Sep 17 00:00:00 2001
From: aahunter <ahunter@ccg.murdoch.edu.au>
Date: Wed, 23 Nov 2016 23:53:07 +0800
Subject: [PATCH] docker: allow uwsgi opts to be set from env

---
 docker-entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index cfeffcec..8074ce8d 100755
--- 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