Docker-compose: update configuration

diff --git a/Dockerfile b/Dockerfile
index 2d6f50764b0ba411f069d2d94a91d560c52af860..742d6fabf4ad0b7f3d6fbe1ce291f5bb4387ae5a 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -83,5 +83,5 @@ RUN /opt/TimeSide/examples/sandbox/manage.py syncdb --noinput
 RUN /opt/TimeSide/examples/sandbox/manage.py migrate --noinput
 RUN /opt/TimeSide/examples/sandbox/manage.py collectstatic --noinput
 
-#EXPOSE 80
+EXPOSE 8000
 #CMD ["supervisord", "-n"]

diff --git a/docker-compose.yml b/docker-compose.yml
index c14ec42474e7b70ec9fc213724827c915d0206a8..6444ccc9ced8c68aabfaf9775c94e9f6205b942c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ data:
   image: tianon/true
   volumes:
     - /var/lib/postgresql
+    
  
 db:
   image: postgres
@@ -14,7 +15,6 @@ nginx:
     - "8080:80"
   volumes:
     - ./examples/deploy/nginx-app.conf:/etc/nginx/sites-enabled/
-    - /var/www/static
     - /media
   links:
     - app
@@ -23,7 +23,7 @@ app:
   build: .
   volumes:
     - .:/opt/TimeSide
-  command: uwsgi --ini /opt/TimeSide/examples/sandbox/uwsgi.ini
+  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 61aacc1e84537308f0fc3f2f5cad419e2b75f4e0..a7cfb5791b86acb9194436811c2ba88671dc8a84 100644 (file)
--- a/examples/deploy/nginx-app.conf
+++ b/examples/deploy/nginx-app.conf
@@ -1,9 +1,11 @@
 # mysite_nginx.conf
 
+# Define connection details for connecting to a django app running in
+# a docker container.
 # the upstream component nginx needs to connect to
-upstream django {
-    server unix:/opt/TimeSide/examples/sandbox/app.sock; # for a file socket
-    # server 127.0.0.1:8001; # for a web port socket (we'll use this first)
+upstream app {
+    #server unix:/opt/TimeSide/examples/sandbox/app.sock; # for a file socket
+    server app:8000; # for a web port socket (we'll use this first)
     }
 
 # configuration of the server
@@ -26,12 +28,31 @@ server {
 
     # Django static
     location /static {
-        alias /var/www/static; # your Django project's static files - amend as required
+        alias app:/var/www/static; # your Django project's static files - amend as required
     }
 
     # Finally, send all non-media requests to the Django server.
     location / {
-        uwsgi_pass  django;
-        include     /etc/nginx/uwsgi_params; # the uwsgi_params file you installed
+        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;
+
+
         }
     }