Add supervisor configuration to launch shibboleth SP daemon only when

ENABLE_SHIBD environment variable is set to "true" (default="false")

Dockerfile

@@ -35,6 +35,7 @@ RUN apt-get install --install-recommends --assume-yes \
 
 COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
 COPY docker/supervisord-apache2.conf /etc/supervisor/conf.d/apache2.conf
+COPY docker/supervisord-shibd.conf /etc/supervisor/conf.d/shibd.conf
 COPY docker/shibboleth-ds /etc/shibboleth-ds
 COPY docker/apache-config /etc/apache2/sites-available/gracedb.conf
 COPY docker/login.ligo.org.cert.LIGOCA.pem /etc/shibboleth/login.ligo.org.cert.LIGOCA.pem
@@ -56,6 +57,7 @@ RUN pip install --upgrade setuptools wheel && \
 
 # Give pip-installed packages priority over distribution packages
 ENV PYTHONPATH /usr/local/lib/python2.7/dist-packages:$PYTHONPATH
+ENV ENABLE_SHIBD false
 ENV VIRTUAL_ENV dummy
 
 # Expose port and run Gunicorn

docker/supervisord-shibd.conf

 [program:shibd]
+autostart=%(ENV_ENABLE_SHIBD)s
 command=/usr/sbin/shibd -F
 user=_shibd
 group=_shibd