Merge remote changes and resolve conflicts

docker-compose.yml

@@ -1,3 +1,5 @@
+version: '3.8'
+
 services:
   frontend:
     build:
@@ -8,7 +10,6 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
     depends_on:
       - backend
@@ -25,8 +26,6 @@ services:
     volumes:
       - ./backend:/app
       - sqlite_data:/app/instance
-    ports:
-      - "8000:8000"
 
 volumes:
   sqlite_data:

docker/nginx/nginx.conf

@@ -1,25 +1,23 @@
-user nginx;
+server {
-worker_processes auto;
+    listen 80;
+    listen [::]:80;
+    server_name itformhelp.ru www.itformhelp.ru;
     
-error_log /var/log/nginx/error.log notice;
+    root /usr/share/nginx/html;
-pid /var/run/nginx.pid;
+    index index.html;
 
-events {
+    location / {
-    worker_connections 1024;
+        try_files $uri $uri/ /index.html;
-}
+        expires -1;
-
+        add_header Cache-Control "no-store, no-cache, must-revalidate";
-http {
+    }
-    include /etc/nginx/mime.types;
+
-    default_type application/octet-stream;
+    location /api/ {
-
+        proxy_pass http://backend:8000/api/;
-    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+        proxy_http_version 1.1;
-                   '$status $body_bytes_sent "$http_referer" '
+        proxy_set_header Host $host;
-                   '"$http_user_agent" "$http_x_forwarded_for"';
+        proxy_set_header X-Real-IP $remote_addr;
-
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    access_log /var/log/nginx/access.log main;
+        proxy_set_header X-Forwarded-Proto $scheme;
-
+    }
-    sendfile on;
-    keepalive_timeout 65;
-
-    include /etc/nginx/conf.d/*.conf;
 }