Merge pull request #628 from shankari/docker-cleanup

Minor fixes to the docker setup

docker/Dockerfile

@@ -34,6 +34,8 @@ ENV DB_HOST=''
 ENV WEB_SERVER_HOST=''
 
 #add start script.
+# this is a redundant workdir setting, but it doesn't harm anything and might
+# be useful if the other one is removed for some reason
 WORKDIR /usr/src/app
 ADD start_script.sh /usr/src/app/start_script.sh
 RUN chmod u+x /usr/src/app/start_script.sh

docker/README.md

@@ -1,11 +1,12 @@
 # Docker usage instructions
 This project is now published on dockerhub!
 https://hub.docker.com/r/emission/e-mission-server/
-and https://hub.docker.com/r/emission/e-mission-server-base/
+
+Both the standard Dockerfile and the docker-compose.yml are in this directory (docker) and should be specified using `-f`. Once we split out the docker stuff into a separate repository, this should become simpler.
 
 Instructions on re-building the image are [in the build instructions](#Docker_Build_Instructions)
 
-1. Initialize Swarm
+1. (optional) If you want to use `swarm` for container management, initialize Swarm
     ```
    docker swarm init 
    ``` 
@@ -16,8 +17,15 @@ Instructions on re-building the image are [in the build instructions](#Docker_Bu
     * Update the port mappings and environment variables if necessary. 
     For more details on how to configure compose files please see the official documentation: https://docs.docker.com/compose/compose-file/#service-configuration-reference 
 
-3. Deploy to swarm
-    ```
+3. Deploy directly
+
+   ```
+    docker-compose -f docker/docker-compose.yml up -d
+   ```
+
+    or to swarm if you initalized it in step 1
+
+   ```
     docker stack deploy -c docker-compose.yml emission
    ```
    There are many ways you can manage your deployment. Again, please see the official documentation for more details: https://docs.docker.com/get-started/part4/

docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   web-server:
-    image: emission-server
+    image: emission/e-mission-server:latest
     depends_on:
       - db
     environment:
@@ -39,4 +39,4 @@ networks:
   emission:
 
 volumes:
-  mongo-data:
+  mongo-data: