updates to dockerfile

Dockerfile

-FROM debian:stable
+#FROM debian:stable
+FROM debian:stretch
 
-RUN apt-get -yqq update
-RUN apt-get -yqq install virtualenv python python-dev vim git gcc libevent-dev libxml2-dev libxslt-dev patch beanstalkd mariadb-server libmariadb-dev libmariadbclient-dev-compat sqlite3
-RUN apt-get -yqq install procps
+RUN [ -z "$NOAPT" ] && apt-get -yqq update
+RUN [ -z "$NOAPT" ] && apt-get -yqq upgrade
+
+RUN [ -z "$NOAPT" ] && apt-get -yqq install virtualenv python python-dev vim git gcc libevent-dev libxml2-dev libxslt-dev patch beanstalkd mariadb-server libmariadb-dev libmariadbclient-dev-compat sqlite3
+RUN [ -z "$NOAPT" ] && apt-get -yqq install procps
 
 # RUN echo "create database fod;" | mysql -u root
 
@@ -19,6 +22,8 @@ RUN (cd /srv/flowspy/; . /srv/venv/bin/activate && \
       ./manage.py syncdb --noinput && \
       ./manage.py migrate;)
 
+RUN [ "$INSTALL_TEST_APACHE_SHIB" = 1 ] && ./inst/apache_shib/apache_shib_init.sh
+
 #  echo "To set environment to English, run: export LC_ALL=en_US"
 #  echo "To activate virualenv: source /srv/venv/bin/activate"
 #  echo "To create a user run: cd /srv/flowspy; ./manage.py createsuperuser"
@@ -27,5 +32,7 @@ RUN (cd /srv/flowspy/; . /srv/venv/bin/activate && \
 
 EXPOSE 8000
 
+WORKDIR /srv/flowspy
+
 CMD [ "/srv/flowspy/runfod.sh" ]