Merge pull request #2 from zamula-soft/master

+ changed after codereview

Author: zamula-soft

02_django_api/Dockerfile

@@ -0,0 +1,13 @@
+FROM python:latest
+
+ENV PYTHONUNBUFFERED  1
+
+RUN mkdir /02-django-api
+WORKDIR /02-django-api
+COPY requirements.txt /02-django-api/
+RUN pip install --upgrade pip && pip install -r requirements.txt
+ADD ./02-django-api
+
+EXPOSE 8000
+
+CMD [ "python", "./manage.py runserver localhost:8000" ]

02_django_api/docker-compose.yml

@@ -13,27 +13,25 @@ services:
 
 
   django:
-    build: ./02_movies_admin
-    command: python manage.py runserver localhost:8000
+    build: ./02_django_api
     depends_on:
       - db
-    ports:
-      - 8000:8000
     env_file:
       -./config/.env
     volumes:
-      - static:/02_movies_admin/static
-      - media:/02_movies_admin/media
-      - nginx_conf:/02_movies_admin/nginx/
+      - static:/02_django_api/static
+      - media:/02_django_api/media
+      - nginx_conf:/02_django_api/nginx/
 
   nginx:
     image: nginx:latest
     ports:
       - "80:80"
     volumes:
-      - static:/02_movies_admin/static
-      - media:/02_movies_admin/media
-      - nginx_conf:/etc/nginx/conf.d/
+      - static:/02_django_api/static
+      - media:/02_django_api/media
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./configs:/etc/nginx/conf.d:ro
     depends_on:
       - django
     restart: always

02_django_api/nginx.conf

@@ -1,23 +1,35 @@
-upstream djangodocker {
-    server django:8000;
+worker_processes  1;
+
+events {
+  worker_connections  1024;
 }
 
-server {
+http {
+  include       mime.types;
+  include conf.d/*.conf;
 
-    listen 80;
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
 
-    location / {
-        proxy_pass http://djangodocker;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $host;
-        proxy_redirect off;
-    }
-    location /static/ {
-        alias /02_movies_admin/static/;
-    }
+  sendfile        on;
+  tcp_nodelay     on;
+  tcp_nopush      on;
+  client_max_body_size 200m;
 
-    location /media/ {
-        alias /02_movies_admin/media/;
-    }
+  gzip on;
+  gzip_comp_level 3;
+  gzip_min_length 1000;
+  gzip_types
+        text/plain
+        text/css
+        application/json
+        application/x-javascript
+        text/xml
+        text/javascript;
 
+  proxy_redirect     off;
+  proxy_set_header   Host             $host;
+  proxy_set_header   X-Real-IP        $remote_addr;
+  proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
 }

02_django_api/site.conf

@@ -0,0 +1,33 @@
+server {
+    listen       80 default_server;
+    listen       [::]:80 default_server;
+    server_name  _;
+
+    root /data;
+
+    location @backend {
+        proxy_pass http://django:8000;
+    }
+
+location ~ ^/(admin|api) {
+    proxy_pass http://django;
+}
+
+    location /static/ {
+        alias /02_django_api/static/;
+    }
+
+    location /media/ {
+        alias /02_django_api/media/;
+    }
+
+    location / {
+        try_files $uri $uri/ @backend;
+    }
+
+    error_page   404              /404.html;
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   html;
+    }
+}