Everything docker related is now available in its own subfolder

.gitignore

@@ -130,6 +130,7 @@ config.backup.json
 uwsgi.ini
 installer.log
 pyshelf_nginx.conf
+!docker/pyshelf_nginx.conf
 tags
 TAGS
 config.json

docker/Dockerfile

@@ -10,8 +10,8 @@ COPY . /pyshelf
 WORKDIR /pyshelf/
 RUN python3 -m pip install -r requirements.txt
 
-COPY ./uwsgi_params /etc/nginx/uwsgi_params
-COPY ./pyshelf_nginx.conf /etc/nginx/sites-available/pyshelf_nginx.conf
+# COPY ../uwsgi_params /etc/nginx/uwsgi_params
+COPY ./docker/pyshelf_nginx.conf /etc/nginx/sites-available/pyshelf_nginx.conf
 RUN ln -s /etc/nginx/sites-available/pyshelf_nginx.conf /etc/nginx/sites-enabled/
 
 WORKDIR /pyshelf/

docker/README.md

@@ -0,0 +1,6 @@
+Use `docker-compose -f .\docker\docker-compose.yml up --build` in the project root. 
+Make sure the following files are in sync:
+* config.json
+* pyshelf_nginx.conf
+* docker-compose.yml
+* uwsgi.ini

docker/docker-compose.yml

@@ -12,12 +12,12 @@ services:
 
     pyshelf:
         build:
-            context: .
-            dockerfile: Dockerfile
+            context: ..
+            dockerfile: ./docker/Dockerfile
         ports: 
             - "8080:8000"
         volumes:
-            - "./books:/books"
+            - "../books:/books"
         depends_on:
             - db
 

docker/pyshelf_nginx.conf

@@ -25,6 +25,6 @@ server {
 
     location / {
         uwsgi_pass django;
-        include /pyshelf/uwsgi_params;
+        include uwsgi_params;
     }
 }

uwsgi_params

@@ -1,17 +0,0 @@
-
-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  REQUEST_SCHEME     $scheme;
-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;