Fix: remap ports for local dev (avoid conflicts with ERPNext/Targo)
All checks were successful
Close Stale Issues / stale (push) Successful in 12s
All checks were successful
Close Stale Issues / stale (push) Successful in 12s
- Frontend: 3000 → 3001 (avoid targo backend conflict) - WebSockets: 8080 → 8085 (avoid ERPNext conflict) - SocketIO: 5000 → 5050 (avoid macOS AirPlay conflict) - Nginx: 80 → 8088 - Fix nginx.conf to use container names instead of host.docker.internal - Add /socket.io proxy route Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
e1f07d71a9
commit
40e55d3ba4
|
|
@ -39,7 +39,7 @@ services:
|
||||||
#/* ---------------------------- Databases / Cache --------------------------- */
|
#/* ---------------------------- Databases / Cache --------------------------- */
|
||||||
mongo_usp:
|
mongo_usp:
|
||||||
image: mongo
|
image: mongo
|
||||||
container_name: mongo_usp
|
container_name: oktopus-mongo
|
||||||
ports:
|
ports:
|
||||||
- 27017:27017
|
- 27017:27017
|
||||||
networks:
|
networks:
|
||||||
|
|
@ -71,8 +71,8 @@ services:
|
||||||
image: "oktopusp/ws"
|
image: "oktopusp/ws"
|
||||||
container_name: websockets
|
container_name: websockets
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8085:8080
|
||||||
- 8081:8081
|
- 8086:8081
|
||||||
env_file:
|
env_file:
|
||||||
- .env.ws
|
- .env.ws
|
||||||
volumes:
|
volumes:
|
||||||
|
|
@ -156,7 +156,7 @@ services:
|
||||||
image: "oktopusp/socketio"
|
image: "oktopusp/socketio"
|
||||||
container_name: socketio
|
container_name: socketio
|
||||||
ports:
|
ports:
|
||||||
- 5000:5000
|
- 5050:5000
|
||||||
env_file:
|
env_file:
|
||||||
- .env.socketio
|
- .env.socketio
|
||||||
volumes:
|
volumes:
|
||||||
|
|
@ -170,9 +170,9 @@ services:
|
||||||
#/* -------------------------------- Frontend -------------------------------- */
|
#/* -------------------------------- Frontend -------------------------------- */
|
||||||
frontend:
|
frontend:
|
||||||
image: "oktopusp/frontend"
|
image: "oktopusp/frontend"
|
||||||
container_name: frontend
|
container_name: oktopus-frontend
|
||||||
ports:
|
ports:
|
||||||
- 3000:3000
|
- 3001:3000
|
||||||
networks:
|
networks:
|
||||||
usp_network:
|
usp_network:
|
||||||
ipv4_address: 172.16.235.14
|
ipv4_address: 172.16.235.14
|
||||||
|
|
@ -210,7 +210,7 @@ services:
|
||||||
image: nginx:latest
|
image: nginx:latest
|
||||||
container_name: nginx
|
container_name: nginx
|
||||||
ports:
|
ports:
|
||||||
- 80:80
|
- 8088:80
|
||||||
volumes:
|
volumes:
|
||||||
- ./nginx.conf:/etc/nginx/conf.d/default.conf
|
- ./nginx.conf:/etc/nginx/conf.d/default.conf
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
|
|
|
||||||
|
|
@ -2,20 +2,12 @@ server {
|
||||||
listen 80;
|
listen 80;
|
||||||
listen [::]:80;
|
listen [::]:80;
|
||||||
server_name _;
|
server_name _;
|
||||||
root /usr/share/nginx/html;
|
|
||||||
|
|
||||||
include /etc/nginx/default.d/*.conf;
|
|
||||||
|
|
||||||
error_page 404 /404.html;
|
|
||||||
location = /404.html {
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://host.docker.internal:3000;
|
proxy_pass http://oktopus-frontend:3000;
|
||||||
proxy_read_timeout 60;
|
proxy_read_timeout 60;
|
||||||
proxy_connect_timeout 60;
|
proxy_connect_timeout 60;
|
||||||
proxy_redirect off;
|
proxy_redirect off;
|
||||||
|
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection 'upgrade';
|
proxy_set_header Connection 'upgrade';
|
||||||
|
|
@ -23,13 +15,20 @@ server {
|
||||||
proxy_cache_bypass $http_upgrade;
|
proxy_cache_bypass $http_upgrade;
|
||||||
}
|
}
|
||||||
location /api {
|
location /api {
|
||||||
proxy_pass http://host.docker.internal:8000;
|
proxy_pass http://controller:8000;
|
||||||
proxy_read_timeout 60;
|
proxy_read_timeout 60;
|
||||||
proxy_connect_timeout 60;
|
proxy_connect_timeout 60;
|
||||||
proxy_redirect off;
|
proxy_redirect off;
|
||||||
}
|
}
|
||||||
|
location /socket.io {
|
||||||
|
proxy_pass http://socketio:5000;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection 'upgrade';
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
}
|
||||||
location /images {
|
location /images {
|
||||||
proxy_pass http://host.docker.internal:8004;
|
proxy_pass http://file-server:8004;
|
||||||
proxy_read_timeout 60;
|
proxy_read_timeout 60;
|
||||||
proxy_connect_timeout 60;
|
proxy_connect_timeout 60;
|
||||||
proxy_redirect off;
|
proxy_redirect off;
|
||||||
|
|
@ -37,8 +36,4 @@ server {
|
||||||
location /companylink {
|
location /companylink {
|
||||||
return 301 https://oktopus.app.br/controller;
|
return 301 https://oktopus.app.br/controller;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
error_page 500 502 503 504 /50x.html;
|
|
||||||
location = /50x.html {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user