diff --git a/phoenix-development/docker-compose.yml b/phoenix-development/docker-compose.yml index 332ec3f..b5f0517 100644 --- a/phoenix-development/docker-compose.yml +++ b/phoenix-development/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: proxy: build: @@ -12,6 +11,7 @@ services: - participate_page - crew_page - rest_static + - checkin_page volumes: - ./nginx.conf:/etc/nginx/nginx.conf logging: @@ -161,3 +161,19 @@ services: logging: options: max-size: "1g" + checkin_page: + build: + context: ../../ + dockerfile: fullstack/phoenix-development/nodejs.Dockerfile + environment: + VITE_APP_URL: "http://checkin.dev.phoenixlan.no:3000" + VITE_API_URL: "http://api.dev.phoenixlan.no:3000" + VITE_API_OAUTH_CLIENT_ID: "phoenix-checkin-dev" + ports: + - 3001:3001 # For Vite HMR + volumes: + - ../../phoenixcheckin-v2:/srv/phoenix + - ../../phoenixjs:/srv/phoenixjs + logging: + options: + max-size: "1g" diff --git a/phoenix-development/nginx.Dockerfile b/phoenix-development/nginx.Dockerfile index 8a9cda2..cabedf4 100644 --- a/phoenix-development/nginx.Dockerfile +++ b/phoenix-development/nginx.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.22 RUN apk add --no-cache nginx diff --git a/phoenix-development/nginx.conf b/phoenix-development/nginx.conf index 2c0ad2b..3f6d588 100644 --- a/phoenix-development/nginx.conf +++ b/phoenix-development/nginx.conf @@ -1,14 +1,19 @@ -daemon off; pid /dev/null; worker_processes auto; error_log /dev/stderr info; events { - worker_connections 1024; +daemon off; +worker_processes auto; +pid /dev/null; +error_log /dev/stderr info; + +events { + worker_connections 1024; } http { - include /etc/nginx/mime.types; + include /etc/nginx/mime.types; client_max_body_size 100M; server { - listen 3000 default_server; + listen 3000; root /var/www; server_name dev.phoenixlan.no; index index.html index.htm; @@ -18,7 +23,7 @@ http { location / { proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://main_page:5000; } } @@ -34,22 +39,20 @@ http { location / { proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://participate_page:3000; } location /sockjs-node { - proxy_pass http://participate_page:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_pass http://participate_page:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; } } - - server { listen 3000; root /var/www; @@ -61,17 +64,17 @@ http { location / { proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://info_page:3000; } location /ws { - proxy_pass http://info_page:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_pass http://info_page:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; } } @@ -86,17 +89,17 @@ http { location / { proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://crew_page:3000; } location /ws { - proxy_pass http://crew_page:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_pass http://crew_page:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; } } @@ -111,23 +114,37 @@ http { location /static { proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://rest_static:8080; } location ~ /static/(default_avatars|tos)/ { proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://rest:8080; } location / { proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://rest:8080; } } - + server { + listen 3000; + root /var/www; + server_name checkin.dev.phoenixlan.no; + index index.html index.htm; + + # Fuck Google + add_header Permissions-Policy interest-cohort=(); + + location / { + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_pass http://checkin_page:5173; + } + } } diff --git a/phoenix-development/nodejs.Dockerfile b/phoenix-development/nodejs.Dockerfile index 63d096f..499744f 100644 --- a/phoenix-development/nodejs.Dockerfile +++ b/phoenix-development/nodejs.Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 +FROM node:24 WORKDIR /srv/phoenix