diff --git a/deploy/compose/docker-compose.yaml b/deploy/compose/docker-compose.yaml index b514ca0..b67f914 100644 --- a/deploy/compose/docker-compose.yaml +++ b/deploy/compose/docker-compose.yaml @@ -39,7 +39,7 @@ services: #/* ---------------------------- Databases / Cache --------------------------- */ mongo_usp: image: mongo - container_name: mongo_usp + container_name: oktopus-mongo ports: - 27017:27017 networks: @@ -71,8 +71,8 @@ services: image: "oktopusp/ws" container_name: websockets ports: - - 8080:8080 - - 8081:8081 + - 8085:8080 + - 8086:8081 env_file: - .env.ws volumes: @@ -156,7 +156,7 @@ services: image: "oktopusp/socketio" container_name: socketio ports: - - 5000:5000 + - 5050:5000 env_file: - .env.socketio volumes: @@ -170,9 +170,9 @@ services: #/* -------------------------------- Frontend -------------------------------- */ frontend: image: "oktopusp/frontend" - container_name: frontend + container_name: oktopus-frontend ports: - - 3000:3000 + - 3001:3000 networks: usp_network: ipv4_address: 172.16.235.14 @@ -210,7 +210,7 @@ services: image: nginx:latest container_name: nginx ports: - - 80:80 + - 8088:80 volumes: - ./nginx.conf:/etc/nginx/conf.d/default.conf extra_hosts: diff --git a/deploy/compose/nginx.conf b/deploy/compose/nginx.conf index 987a82d..e7792e1 100644 --- a/deploy/compose/nginx.conf +++ b/deploy/compose/nginx.conf @@ -2,20 +2,12 @@ server { listen 80; listen [::]:80; server_name _; - root /usr/share/nginx/html; - - include /etc/nginx/default.d/*.conf; - - error_page 404 /404.html; - location = /404.html { - } location / { - proxy_pass http://host.docker.internal:3000; + proxy_pass http://oktopus-frontend:3000; proxy_read_timeout 60; proxy_connect_timeout 60; proxy_redirect off; - proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; @@ -23,13 +15,20 @@ server { proxy_cache_bypass $http_upgrade; } location /api { - proxy_pass http://host.docker.internal:8000; + proxy_pass http://controller:8000; proxy_read_timeout 60; proxy_connect_timeout 60; 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 { - proxy_pass http://host.docker.internal:8004; + proxy_pass http://file-server:8004; proxy_read_timeout 60; proxy_connect_timeout 60; proxy_redirect off; @@ -37,8 +36,4 @@ server { location /companylink { return 301 https://oktopus.app.br/controller; } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - } -} \ No newline at end of file +}