From 35f415b02ad860cc4d2b3d0563cf8db7bd895945 Mon Sep 17 00:00:00 2001 From: Leonard Date: Thu, 20 Feb 2025 22:10:24 +0100 Subject: [PATCH 1/6] added multiplayer server --- Dockerfile | 2 +- nginx-templates/body-multiplayer.conf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 nginx-templates/body-multiplayer.conf diff --git a/Dockerfile b/Dockerfile index dbd9936..f8e5aba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ENV DNS_NAMESERVER="127.0.0.11" # domain name attended to the container names ENV LOCAL_DOMAIN="" # default and keycloak should always be present -ENV SERVICES="default keycloak bugfinder chickenshock crosswordpuzzle fileserver finitequiz memory regexgame towercrush towerdefense" +ENV SERVICES="default keycloak bugfinder chickenshock crosswordpuzzle fileserver finitequiz memory multiplayer regexgame towercrush towerdefense" ENV SSL_ENABLED="true" COPY entrypoint.sh /entrypoint.sh diff --git a/nginx-templates/body-multiplayer.conf b/nginx-templates/body-multiplayer.conf new file mode 100644 index 0000000..661a9ff --- /dev/null +++ b/nginx-templates/body-multiplayer.conf @@ -0,0 +1,4 @@ + location /multiplayer/ { + rewrite ^/minigames/finitequiz/(.*)$ /$1 break; + proxy_pass http://$multiplayer/; + } \ No newline at end of file From 73e99bee11dd55d8e6856f68925aacaa004a2e81 Mon Sep 17 00:00:00 2001 From: Leonard Date: Thu, 20 Feb 2025 22:14:29 +0100 Subject: [PATCH 2/6] more adjustements --- nginx-templates/body-main.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx-templates/body-main.conf b/nginx-templates/body-main.conf index 7754982..eb5868f 100644 --- a/nginx-templates/body-main.conf +++ b/nginx-templates/body-main.conf @@ -24,6 +24,7 @@ set $towercrush_backend ###DEPLOYMENT_NAME###-towercrush-backend###LOCAL_DOMAIN###; set $towerdefense ###DEPLOYMENT_NAME###-towerdefense###LOCAL_DOMAIN###; set $towerdefense_backend ###DEPLOYMENT_NAME###-towerdefense-backend###LOCAL_DOMAIN###; + set $multiplayer ###DEPLOYMENT_NAME###-multiplayer###LOCAL_DOMAIN###; proxy_buffer_size 128k; proxy_buffers 4 256k; From d5cf335d418e6ea4f3edc283eb3548f55ffaace4 Mon Sep 17 00:00:00 2001 From: Leonard Date: Sat, 22 Feb 2025 17:17:12 +0100 Subject: [PATCH 3/6] added websocket proxy pass --- Dockerfile | 4 ++-- entrypoint.sh | 1 - nginx-templates/body-default.conf | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f8e5aba..04f59ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,10 +12,10 @@ ENV DNS_NAMESERVER="127.0.0.11" # domain name attended to the container names ENV LOCAL_DOMAIN="" # default and keycloak should always be present -ENV SERVICES="default keycloak bugfinder chickenshock crosswordpuzzle fileserver finitequiz memory multiplayer regexgame towercrush towerdefense" +ENV SERVICES="default keycloak bugfinder chickenshock crosswordpuzzle fileserver finitequiz memory regexgame towercrush towerdefense" ENV SSL_ENABLED="true" COPY entrypoint.sh /entrypoint.sh ENTRYPOINT [ "/entrypoint.sh" ] -CMD ["nginx", "-g", "daemon off;"] +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index 8140b2f..ff40804 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -22,7 +22,6 @@ else fi replaceVariables body-main.conf >> "$NGINX_OUTPUT_CONFIG_FILE" for SERVICE in ${SERVICES}; do - echo $SERVICE replaceVariables "body-${SERVICE}.conf" >> "$NGINX_OUTPUT_CONFIG_FILE" done replaceVariables footer.conf >> "$NGINX_OUTPUT_CONFIG_FILE" diff --git a/nginx-templates/body-default.conf b/nginx-templates/body-default.conf index 56c1e99..de5b32b 100644 --- a/nginx-templates/body-default.conf +++ b/nginx-templates/body-default.conf @@ -26,3 +26,21 @@ rewrite ^/third-party-license-notice/(.*)$ /$1 break; proxy_pass http://$third_party_license_notice; } + + location /multiplayer/api/ { + rewrite ^/multiplayer/(.*)$ /$1 break; + proxy_pass http://$multiplayer:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + } + + location /multiplayer/ws { + proxy_pass http://$multiplayer:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_read_timeout 60s; + } \ No newline at end of file From 0d0270476a35693e7d7575144ee6c465bca9d792 Mon Sep 17 00:00:00 2001 From: Leonard Date: Sun, 2 Mar 2025 16:46:10 +0100 Subject: [PATCH 4/6] renamed multiplayer to multiplayer-server --- nginx-templates/body-default.conf | 10 +++++----- nginx-templates/body-main.conf | 2 +- nginx-templates/body-multiplayer.conf | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 nginx-templates/body-multiplayer.conf diff --git a/nginx-templates/body-default.conf b/nginx-templates/body-default.conf index de5b32b..57d16e1 100644 --- a/nginx-templates/body-default.conf +++ b/nginx-templates/body-default.conf @@ -27,17 +27,17 @@ proxy_pass http://$third_party_license_notice; } - location /multiplayer/api/ { - rewrite ^/multiplayer/(.*)$ /$1 break; - proxy_pass http://$multiplayer:3000; + location /multiplayer-server/api/ { + rewrite ^/multiplayer-server/(.*)$ /$1 break; + proxy_pass http://$multiplayer-server:3000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; proxy_set_header Host $host; } - location /multiplayer/ws { - proxy_pass http://$multiplayer:3000; + location /multiplayer-server/ws { + proxy_pass http://$multiplayer-server:3000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; diff --git a/nginx-templates/body-main.conf b/nginx-templates/body-main.conf index eb5868f..e239864 100644 --- a/nginx-templates/body-main.conf +++ b/nginx-templates/body-main.conf @@ -24,7 +24,7 @@ set $towercrush_backend ###DEPLOYMENT_NAME###-towercrush-backend###LOCAL_DOMAIN###; set $towerdefense ###DEPLOYMENT_NAME###-towerdefense###LOCAL_DOMAIN###; set $towerdefense_backend ###DEPLOYMENT_NAME###-towerdefense-backend###LOCAL_DOMAIN###; - set $multiplayer ###DEPLOYMENT_NAME###-multiplayer###LOCAL_DOMAIN###; + set $multiplayer_server ###DEPLOYMENT_NAME###-multiplayer-server###LOCAL_DOMAIN###; proxy_buffer_size 128k; proxy_buffers 4 256k; diff --git a/nginx-templates/body-multiplayer.conf b/nginx-templates/body-multiplayer.conf deleted file mode 100644 index 661a9ff..0000000 --- a/nginx-templates/body-multiplayer.conf +++ /dev/null @@ -1,4 +0,0 @@ - location /multiplayer/ { - rewrite ^/minigames/finitequiz/(.*)$ /$1 break; - proxy_pass http://$multiplayer/; - } \ No newline at end of file From ba93e5838bb29b77a2b8a8ec790ddd60170383a2 Mon Sep 17 00:00:00 2001 From: Leonard Date: Thu, 6 Mar 2025 18:37:09 +0100 Subject: [PATCH 5/6] fixed domain name --- nginx-templates/body-default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-templates/body-default.conf b/nginx-templates/body-default.conf index 57d16e1..147e38b 100644 --- a/nginx-templates/body-default.conf +++ b/nginx-templates/body-default.conf @@ -29,7 +29,7 @@ location /multiplayer-server/api/ { rewrite ^/multiplayer-server/(.*)$ /$1 break; - proxy_pass http://$multiplayer-server:3000; + proxy_pass http://$multiplayer_server:3000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; @@ -37,7 +37,7 @@ } location /multiplayer-server/ws { - proxy_pass http://$multiplayer-server:3000; + proxy_pass http://$multiplayer_server:3000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; From b511a3912f1a13583dd06d8266eaf1db86952004 Mon Sep 17 00:00:00 2001 From: Leonard Date: Wed, 19 Mar 2025 17:55:21 +0100 Subject: [PATCH 6/6] changed port to 80 --- nginx-templates/body-default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx-templates/body-default.conf b/nginx-templates/body-default.conf index 147e38b..3ff21c7 100644 --- a/nginx-templates/body-default.conf +++ b/nginx-templates/body-default.conf @@ -29,7 +29,7 @@ location /multiplayer-server/api/ { rewrite ^/multiplayer-server/(.*)$ /$1 break; - proxy_pass http://$multiplayer_server:3000; + proxy_pass http://$multiplayer_server; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; @@ -37,7 +37,7 @@ } location /multiplayer-server/ws { - proxy_pass http://$multiplayer_server:3000; + proxy_pass http://$multiplayer_server; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade';