rm lib and log containers

diff --git a/docker-compose.yml b/docker-compose.yml
index 75e3b45511bd19032d2dee0c50df246a93d65e2a..ef2c7bf8ccae57ccea8327ec4604cc45061ab6f2 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,25 +28,6 @@ static:
     - /var/www/static
   command: "true"
 
-log:
-  image: debian:wheezy
-  volumes:
-    - /var/log/nginx
-    - /var/log/postgres
-    - /var/log/mysql
-    - /var/log/uwsgi
-    - /var/log/elasticsearch
-  command: "true"
-
-lib:
-  image: debian:wheezy
-  volumes:
-    - /var/lib/rabbitmq
-    - /var/lib/postgres
-    - ./var/lib/mysql:/var/lib/mysql
-    - ./var/lib/elasticsearch:/var/lib/elasticsearch
-  command: "true"
-
 home:
   image: debian:wheezy
   volumes:
@@ -55,9 +36,9 @@ home:
 
 db:
   image: mysql
-  volumes_from:
-    - lib
-    - log
+  volumes:
+    - ./var/lib/mysql:/var/lib/mysql
+    - /var/log/mysql
   environment:
     - MYSQL_ROOT_PASSWORD=ItCydyatzix8
     - MYSQL_DATABASE=telemeta
@@ -71,18 +52,15 @@ rabbitmq:
 
 search:
   image: elasticsearch
-  volumes_from:
-    - lib
-    - log
 
 app:
   build: .
   volumes:
     - .:/opt/Telemeta
+    - /var/log/uwsgi
   volumes_from:
     - static
     - home
-    - log
   command: /bin/sh /opt/Telemeta/examples/deploy/start_app.sh
   ports:
     - "9000:9000"
@@ -98,7 +76,6 @@ worker:
   volumes_from:
     - app
     - home
-    - log
   command: /bin/sh /opt/Telemeta/examples/deploy/celery_app.sh
   links:
     - rabbitmq
@@ -110,9 +87,9 @@ nginx:
     - "8000:80"
   volumes:
     - ./examples/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
+    - /var/log/nginx
   volumes_from:
     - static
     - home
-    - log
   links:
     - app