WIP: More docker tweaks

docker/4_run/run.docker

@@ -1,10 +1,10 @@
 FROM pillar_py:3.6
+LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
 
 RUN apt-get update && apt-get install -qyy \
 -o APT::Install-Recommends=false -o APT::Install-Suggests=false \
 git \
 apache2 \
-libapache2-mod-wsgi \
 libapache2-mod-xsendfile \
 libjpeg8 \
 libtiff5 \
@@ -27,11 +27,7 @@ RUN mkdir -p $APACHE_RUN_DIR $APACHE_LOCK_DIR $APACHE_LOG_DIR
 ADD wheelhouse /data/wheelhouse
 RUN pip3 install --no-index --find-links=/data/wheelhouse -r /data/wheelhouse/requirements.txt
 
-VOLUME /data/git/blender-cloud
-VOLUME /data/git/pillar
-VOLUME /data/git/pillar-python-sdk
-VOLUME /data/git/attract
-VOLUME /data/git/flamenco
+VOLUME /data/git
 VOLUME /data/config
 VOLUME /data/storage
 
@@ -40,9 +36,19 @@ ENV USE_X_SENDFILE True
 EXPOSE 80
 EXPOSE 5000
 
+ADD wsgi-py36.* /etc/apache2/mods-available/
+RUN a2enmod rewrite && a2enmod wsgi-py36
+
 ADD apache2.conf /etc/apache2/apache2.conf
 ADD 000-default.conf /etc/apache2/sites-available/000-default.conf
 ADD docker-entrypoint.sh /docker-entrypoint.sh
 ADD manage.sh /manage.sh
 
-ENTRYPOINT ["bash", "/docker-entrypoint.sh"]
+# Remove some empty top-level directories we won't use anyway.
+RUN rmdir /media /home 2>/dev/null || true
+
+# This file includes some useful commands to have in the shell history
+# for easy access.
+ADD bash_history /root/.bash_history
+
+ENTRYPOINT /docker-entrypoint.sh