Merge branch 'dev' into release

# Conflicts:
#	nginx/nginx.conf

nginx/Dockerfile

@@ -2,8 +2,22 @@ FROM node:20-alpine AS frontend-build
 
 WORKDIR /app
 
+ARG NPM_CONFIG_REGISTRY=https://registry.npmjs.org/
+ARG VITE_RUNTIME_ENV=production
+ARG VITE_ALLOW_INSECURE_DEV_LOGIN=false
+ENV NPM_CONFIG_REGISTRY=$NPM_CONFIG_REGISTRY
+ENV VITE_RUNTIME_ENV=$VITE_RUNTIME_ENV
+ENV VITE_ALLOW_INSECURE_DEV_LOGIN=$VITE_ALLOW_INSECURE_DEV_LOGIN
+
 COPY frontend/package*.json ./
-RUN npm ci
+RUN --mount=type=cache,target=/root/.npm \
+    npm ci \
+      --prefer-offline \
+      --no-audit \
+      --fetch-retries=5 \
+      --fetch-retry-mintimeout=20000 \
+      --fetch-retry-maxtimeout=120000 \
+      --replace-registry-host=npmjs
 
 COPY frontend/ ./
 RUN npm run build

nginx/nginx.conf

@@ -42,6 +42,17 @@ http {
             add_header Cache-Control "public, max-age=86400" always;
         }
 
+        location = /index.html {
+            try_files /index.html =404;
+            add_header Cache-Control "no-store, no-cache, must-revalidate" always;
+        }
+
+        location /assets/ {
+            try_files $uri =404;
+            add_header Cache-Control "public, max-age=31536000, immutable" always;
+        }
+
+
         location ~* (^|/)(\.git|\.env($|[./_-])|wp-config\.php|config\.php|database\.yml|backup($|[._/-])) {
             access_log off;
             log_not_found off;
@@ -66,6 +77,7 @@ http {
 
         location / {
             try_files $uri $uri/ /index.html;
+            add_header Cache-Control "no-store, no-cache, must-revalidate" always;
         }
     }
 }

nginx/nginx.dev.conf

@@ -0,0 +1,88 @@
+worker_processes 1;
+
+error_log /var/log/nginx/error.log warn;
+pid /var/run/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    resolver 127.0.0.11 valid=10s ipv6=off;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    keepalive_timeout  65;
+
+    upstream backend {
+        zone backend 64k;
+        server backend:8000 resolve;
+    }
+
+    upstream frontend_dev {
+        zone frontend_dev 64k;
+        server frontend-dev:5173 resolve;
+    }
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        "" close;
+    }
+
+    server {
+        listen 80;
+        server_name _;
+        client_max_body_size 20m;
+
+        location = /favicon.ico {
+            root /usr/share/nginx/html;
+            try_files /favicon.ico =204;
+            access_log off;
+            log_not_found off;
+            expires 1d;
+            add_header Cache-Control "public, max-age=86400" always;
+        }
+
+        location ~* (^|/)(\.git|\.env($|[./_-])|wp-config\.php|config\.php|database\.yml|backup($|[._/-])) {
+            access_log off;
+            log_not_found off;
+            return 404;
+        }
+
+        location /api/ {
+            proxy_pass http://backend;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+        location /health {
+            proxy_pass http://backend;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+        location / {
+            proxy_pass http://frontend_dev;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_read_timeout 60s;
+            proxy_send_timeout 60s;
+        }
+    }
+}