Upgraded docker-compose.yaml file format from 1 to 3.4

This allows us to set logging options, which weren't available in version 1.
I've also added newlines around each service definition, and made the
formatting consistent across the entire file (using align-yaml, one of the
tools of the atom-beautify plugin for Atom).

docker/docker-compose.yml

@@ -1,4 +1,6 @@
-mongo:
+version:                       '3.4'
+services:
+  mongo:
     image:                     mongo:3.4.2
     container_name:            mongo
     restart:                   always
@@ -7,19 +9,22 @@ mongo:
      - /data/storage/db-bak:/data/db-bak # for backing up stuff etc.
     ports:
      - "127.0.0.1:27017:27017"
-redis:
+
+  redis:
     image:                     redis:3.2.8
     container_name:            redis
     restart:                   always
     ports:
      - "127.0.0.1:6379:6379"
-rabbit:
+
+  rabbit:
       image:                   rabbitmq:3.6.10
       container_name:          rabbit
       restart:                 always
       ports:
           - "127.0.0.1:5672:5672"
-elastic:
+
+  elastic:
       image:                   armadillica/elasticsearch:latest
       container_name:          elastic
       restart:                 always
@@ -30,14 +35,16 @@ elastic:
           - "127.0.0.1:9200:9200"
       environment:
           ES_JAVA_OPTS:        "-Xms256m -Xmx256m"
-elasticproxy:
+
+  elasticproxy:
       image:                   armadillica/elasticproxy:latest
       container_name:          elasticproxy
       restart:                 always
       command:                 /elasticproxy -elastic http://elastic:9200/
       links:
           - elastic
-kibana:
+
+  kibana:
       image:                   armadillica/kibana:latest
       container_name:          kibana
       restart:                 always
@@ -53,7 +60,8 @@ kibana:
           NODE_OPTIONS:        "--max-old-space-size=200"
       links:
           - elasticproxy
-blender_cloud:
+
+  blender_cloud:
     image:                     armadillica/blender_cloud:latest
     container_name:            blender_cloud
     restart:                   always
@@ -72,7 +80,8 @@ blender_cloud:
      - mongo
      - redis
      - rabbit
-celery_worker:
+
+  celery_worker:
     image:                     armadillica/blender_cloud:latest
     entrypoint:                /celery-worker.sh
     container_name:            celery_worker
@@ -87,7 +96,8 @@ celery_worker:
      - mongo
      - redis
      - rabbit
-celery_beat:
+
+  celery_beat:
     image:                     armadillica/blender_cloud:latest
     entrypoint:                /celery-beat.sh
     container_name:            celery_beat
@@ -101,24 +111,27 @@ celery_beat:
      - mongo
      - redis
      - rabbit
-# notifserv:
-#   container_name: notifserv
-#   image: armadillica/pillar-notifserv:cd8fa678436563ac3b800b2721e36830c32e4656
-#   restart: always
-#   links:
-#    - mongo
-#   environment:
-#    VIRTUAL_HOST: https://cloud.blender.org/notifications*,http://pillar-web/notifications*
-#    VIRTUAL_HOST_WEIGHT: 20
-#    FORCE_SSL: true
-grafista:
+
+  # notifserv:
+  #   container_name:          notifserv
+  #   image:                   armadillica/pillar-notifserv:cd8fa678436563ac3b800b2721e36830c32e4656
+  #   restart:                 always
+  #   links:
+  #    - mongo
+  #   environment:
+  #    VIRTUAL_HOST:           https://cloud.blender.org/notifications*,http://pillar-web/notifications*
+  #    VIRTUAL_HOST_WEIGHT:    20
+  #    FORCE_SSL:              true
+
+  grafista:
     image:                     armadillica/grafista:latest
     container_name:            grafista
     restart:                   always
     volumes:
       - /data/git/grafista:/data/git/grafista:ro
       - /data/storage/grafista:/data/storage/grafista
-letsencrypt:
+
+  letsencrypt:
       image:                   armadillica/picohttp:latest
       container_name:          letsencrypt
       restart:                 always
@@ -129,7 +142,8 @@ letsencrypt:
           VIRTUAL_HOST_WEIGHT: 20
       volumes:
           - /data/letsencrypt:/data/letsencrypt
-haproxy:
+
+  haproxy:
     image:                     dockercloud/haproxy:1.5.3
     container_name:            haproxy
     restart:                   always