Add make target for running inside docker

Author: bnaul

Dockerfile

@@ -28,7 +28,7 @@ WORKDIR /cesium
 RUN bash -c "source /cesium_env/bin/activate && \
     make paths && \
     make dependencies && \
-    cp docker/cesium.yaml . && \
+    cp docker/cesium.yaml ./docker.yaml && \
     chown -R cesium.cesium /cesium_env && \
     chown -R cesium.cesium /cesium"
 
@@ -38,5 +38,5 @@ EXPOSE 5000
 
 CMD bash -c "source /cesium_env/bin/activate && \
              (make log &) && \
-             make run"
+             make dockerrun"
 

Makefile

@@ -63,6 +63,9 @@ attach:
 testrun: paths dependencies
 	export FLAGS="--config _test_config.yaml" && $(SUPERVISORD)
 
+dockerrun: paths dependencies
+	export FLAGS="--config docker.yaml" && $(SUPERVISORD)
+
 debug:
 	@echo "Starting web service in debug mode"
 	@echo "Press Ctrl-D to stop"

docker-compose/docker-compose.yml

@@ -6,7 +6,7 @@ web:
     - db
 
 db:
-  image: postgres:9.5
+  image: postgres:9.6
   environment:
     - POSTGRES_USER=cesium
     - POSTGRES_PASSWORD=