docker-compose: add multpile data volume containers

diff --git a/docker-compose.yml b/docker-compose.yml
index 6444ccc9ced8c68aabfaf9775c94e9f6205b942c..67c88c024bdbc43cea76920f84abe3018e2022f3 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,23 @@
-data:
-  image: tianon/true
+datadb:
+  image: debian:stable
   volumes:
     - /var/lib/postgresql
+
+datastatic:
+  image: debian:stable
+  volumes:
+    - /var/www
     
- 
+datalog:
+  image: debian:stable
+  volumes:
+    - /var/log/nginx
+    - /var/log/postgres
+        
 db:
   image: postgres
   volumes_from:
-    - data
+    - datadb
 
 nginx:
   image: nginx
@@ -16,6 +26,9 @@ nginx:
   volumes:
     - ./examples/deploy/nginx-app.conf:/etc/nginx/sites-enabled/
     - /media
+  volumes_from:
+    - datastatic
+    - datalog
   links:
     - app
 
@@ -23,6 +36,8 @@ app:
   build: .
   volumes:
     - .:/opt/TimeSide
+  volumes_from:
+    - datastatic
   command: uwsgi --ini /opt/TimeSide/examples/sandbox/uwsgi.ini:local
   ports:
     - "8000:8000"

diff --git a/examples/deploy/nginx-app.conf b/examples/deploy/nginx-app.conf
index a7cfb5791b86acb9194436811c2ba88671dc8a84..bc2eb3f48d45a90b00f50335b1f9b9dd6d744970 100644 (file)
--- a/examples/deploy/nginx-app.conf
+++ b/examples/deploy/nginx-app.conf
@@ -28,31 +28,17 @@ server {
 
     # Django static
     location /static {
-        alias app:/var/www/static; # your Django project's static files - amend as required
+        alias /var/www/static; # your Django project's static files - amend as required
     }
 
-    # Finally, send all non-media requests to the Django server.
+    # WSGI proxy settings
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+    proxy_buffering on;
+    proxy_read_timeout 43200;
     location / {
-        uwsgi_pass  app:8000;
-        #include     /etc/nginx/uwsgi_params; # the uwsgi_params file you installed
-
-       # the uwsgi_params file you installed needs to be passed with each
-       # request.
-       # the uwsgi_params need to be passed with each uwsgi request
-       uwsgi_param QUERY_STRING $query_string;
-       uwsgi_param REQUEST_METHOD $request_method;
-       uwsgi_param CONTENT_TYPE $content_type;
-       uwsgi_param CONTENT_LENGTH $content_length;
-       uwsgi_param REQUEST_URI $request_uri;
-       uwsgi_param PATH_INFO $document_uri;
-       uwsgi_param DOCUMENT_ROOT $document_root;
-       uwsgi_param SERVER_PROTOCOL $server_protocol;
-       uwsgi_param HTTPS $https if_not_empty;
-       uwsgi_param REMOTE_ADDR $remote_addr;
-       uwsgi_param REMOTE_PORT $remote_port;
-       uwsgi_param SERVER_PORT $server_port;
-       uwsgi_param SERVER_NAME $server_name;
-
-
-        }
-    }
+            proxy_pass http://app; # Duplicated in location statements below.
+    }   
+
+}