From cd14501612dc4a578aaaad3c61ff1da694de408c Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:01:35 +0100 Subject: [PATCH 1/4] remove port 80 from http.conf --- docker/development/etc/nginx/site-opts.d/http.conf | 2 -- docker/production/etc/nginx/site-opts.d/http.conf | 2 -- 2 files changed, 4 deletions(-) diff --git a/docker/development/etc/nginx/site-opts.d/http.conf b/docker/development/etc/nginx/site-opts.d/http.conf index 9f7e49ee2..a5bbd78a3 100644 --- a/docker/development/etc/nginx/site-opts.d/http.conf +++ b/docker/development/etc/nginx/site-opts.d/http.conf @@ -1,5 +1,3 @@ -listen 80 default_server; -listen [::]:80 default_server; listen 8080 default_server; listen [::]:8080 default_server; diff --git a/docker/production/etc/nginx/site-opts.d/http.conf b/docker/production/etc/nginx/site-opts.d/http.conf index 9f7e49ee2..a5bbd78a3 100644 --- a/docker/production/etc/nginx/site-opts.d/http.conf +++ b/docker/production/etc/nginx/site-opts.d/http.conf @@ -1,5 +1,3 @@ -listen 80 default_server; -listen [::]:80 default_server; listen 8080 default_server; listen [::]:8080 default_server; From 02976e454a466119d9af92cb01203647261f1323 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:02:47 +0100 Subject: [PATCH 2/4] fix: check port 8080 and fallback to 80 --- docker/coolify-realtime/terminal-server.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/docker/coolify-realtime/terminal-server.js b/docker/coolify-realtime/terminal-server.js index 6633204b2..d1d74c89f 100755 --- a/docker/coolify-realtime/terminal-server.js +++ b/docker/coolify-realtime/terminal-server.js @@ -33,12 +33,22 @@ const verifyClient = async (info, callback) => { try { // Authenticate with Laravel backend - const response = await axios.post(`http://coolify/terminal/auth`, null, { - headers: { - 'Cookie': `${sessionCookieName}=${laravelSession}`, - 'X-XSRF-TOKEN': xsrfToken - }, - }); + let response; + try { + response = await axios.post(`http://coolify:8080/terminal/auth`, null, { + headers: { + 'Cookie': `${sessionCookieName}=${laravelSession}`, + 'X-XSRF-TOKEN': xsrfToken + }, + }); + } catch (error) { + response = await axios.post(`http://coolify/terminal/auth`, null, { + headers: { + 'Cookie': `${sessionCookieName}=${laravelSession}`, + 'X-XSRF-TOKEN': xsrfToken + }, + }); + } if (response.status === 200) { // Authentication successful From b1759bf25d9c3b8b484ada7cc5ad928bad6ae124 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 17 Dec 2024 11:30:36 +0100 Subject: [PATCH 3/4] use only port 8080 in the new version --- docker/coolify-realtime/terminal-server.js | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/docker/coolify-realtime/terminal-server.js b/docker/coolify-realtime/terminal-server.js index d1d74c89f..6649f866c 100755 --- a/docker/coolify-realtime/terminal-server.js +++ b/docker/coolify-realtime/terminal-server.js @@ -33,22 +33,12 @@ const verifyClient = async (info, callback) => { try { // Authenticate with Laravel backend - let response; - try { - response = await axios.post(`http://coolify:8080/terminal/auth`, null, { - headers: { - 'Cookie': `${sessionCookieName}=${laravelSession}`, - 'X-XSRF-TOKEN': xsrfToken - }, - }); - } catch (error) { - response = await axios.post(`http://coolify/terminal/auth`, null, { - headers: { - 'Cookie': `${sessionCookieName}=${laravelSession}`, - 'X-XSRF-TOKEN': xsrfToken - }, - }); - } + const response = await axios.post(`http://coolify:8080/terminal/auth`, null, { + headers: { + 'Cookie': `${sessionCookieName}=${laravelSession}`, + 'X-XSRF-TOKEN': xsrfToken + }, + }); if (response.status === 200) { // Authentication successful From a5b41746dd9f83f90bba88061f9efea285007383 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 17 Dec 2024 11:30:52 +0100 Subject: [PATCH 4/4] update compose files --- docker-compose.dev.yml | 2 +- docker-compose.prod.yml | 2 +- other/nightly/docker-compose.prod.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 76f8e9ca6..3fadd914c 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -7,7 +7,7 @@ services: - USER_ID=${USERID:-1000} - GROUP_ID=${GROUPID:-1000} ports: - - "${APP_PORT:-8000}:80" + - "${APP_PORT:-8000}:8080" environment: AUTORUN_ENABLED: false PUSHER_HOST: "${PUSHER_HOST}" diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index d86b2336b..c7349f7b0 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -54,7 +54,7 @@ services: - SSH_MUX_ENABLED - SSH_MUX_PERSIST_TIME ports: - - "${APP_PORT:-8000}:80" + - "${APP_PORT:-8000}:8080" expose: - "${APP_PORT:-8000}" healthcheck: diff --git a/other/nightly/docker-compose.prod.yml b/other/nightly/docker-compose.prod.yml index d86b2336b..f9cded363 100644 --- a/other/nightly/docker-compose.prod.yml +++ b/other/nightly/docker-compose.prod.yml @@ -54,7 +54,7 @@ services: - SSH_MUX_ENABLED - SSH_MUX_PERSIST_TIME ports: - - "${APP_PORT:-8000}:80" + - "${APP_PORT:-8000}:8080" expose: - "${APP_PORT:-8000}" healthcheck: @@ -93,7 +93,7 @@ services: retries: 10 timeout: 2s soketi: - image: 'ghcr.io/coollabsio/coolify-realtime:1.0.4' + image: 'ghcr.io/coollabsio/coolify-realtime:next' ports: - "${SOKETI_PORT:-6001}:6001" - "6002:6002"