Merge branch 'spinnaker_config' into 'master'

Spinnaker config

See merge request jupyter/clb-jupyter-nb-images!40

base/.spynnaker.cfg

+[Machine]
+spalloc_server = https://spinnaker.cs.man.ac.uk/spalloc/
+
+[Java]
+use_java = True

base/Dockerfile

@@ -124,6 +124,7 @@ RUN fix-permissions /opt/app-root/ && \
 COPY base/passwd.template /tmp/passwd.template
 COPY base/group.template /tmp/group.template
 COPY base/start-notebook.sh /opt/app-root/etc/
+COPY base/.spynnaker.cfg /opt/app-root/src/
 RUN chmod +x /opt/app-root/etc/start-notebook.sh
 
 WORKDIR /opt/app-root/src/