compose: cleanup, add uwsgi log

diff --git a/docker-compose.yml b/docker-compose.yml
index 141e3a7a2e4332efad803a23cc074a30cd5168a3..3b75184fb60ed091cb9aac7dd0d6059c109f9ace 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,32 +1,33 @@
-datadb:
-  image: debian:wheezy
-  volumes:
-    - /var/lib/postgresql
-  command: /bin/true
-
-datamedia:
+media:
   image: debian:wheezy
   volumes:
     - ./examples/sandbox/media:/media
   command: /bin/true
 
-datastatic:
+static:
   image: debian:wheezy
   volumes:
     - /var/www/static
   command: true
 
-datalog:
+log:
   image: debian:wheezy
   volumes:
     - /var/log/nginx
     - /var/log/postgres
+    - /var/log/uwsgi
   command: /bin/true
 
-db:
-  image: postgres
-  volumes_from:
-    - datadb
+# datadb:
+#   image: debian:wheezy
+#   volumes:
+#     - /var/lib/postgresql
+#   command: /bin/true
+
+# db:
+#   image: postgres
+#   volumes_from:
+#     - datadb
 
 nginx:
   image: nginx
@@ -35,8 +36,9 @@ nginx:
   volumes:
     - ./examples/deploy/nginx/sites-enabled/app.conf:/etc/nginx/conf.d/default.conf
   volumes_from:
-    - datastatic
-    - datamedia
+    - static
+    - media
+    - log
   links:
     - app
 
@@ -45,8 +47,9 @@ app:
   volumes:
     - .:/opt/TimeSide
   volumes_from:
-    - datastatic
-    - datamedia
+    - static
+    - media
+    - log
   command: /bin/sh /opt/TimeSide/examples/deploy/start_app.sh
   expose:
     - "80" #default runserver wsgi port
\ No newline at end of file