Merge branch 'staging-deployment-config' into staging-unstable

Dockerfile

@@ -6,4 +6,4 @@ ADD . /
 RUN pip3 install -r /requirements.txt
 
 EXPOSE 80/tcp
-CMD [ "/usr/local/bin/python3", "-m", "matemat" ]
+CMD [ "/usr/local/bin/python3", "-m", "matemat", "/etc/matemat.conf", "/matemat.docker.conf" ]

matemat.docker.conf

@@ -0,0 +1,13 @@
+[Matemat]
+
+Address=::
+Port=80
+
+StaticPath=/static
+TemplatePath=/templates
+
+LogTarget=stdout
+
+[Pagelets]
+UploadDir=/static/upload
+DatabaseFile=/var/matemat/db/test.db