From dffb6188ffacd7379b716592878ed9134e79430a Mon Sep 17 00:00:00 2001 From: AndrewJGaut Date: Tue, 6 Dec 2022 10:40:57 -0800 Subject: [PATCH 1/3] The ws-server was not included in the nginx Docker compose service as a service that it depends on, which broke nginx --- docker_config/compose_files/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker_config/compose_files/docker-compose.yml b/docker_config/compose_files/docker-compose.yml index 14dc41d9c..daa50fc63 100644 --- a/docker_config/compose_files/docker-compose.yml +++ b/docker_config/compose_files/docker-compose.yml @@ -357,6 +357,7 @@ services: depends_on: - frontend - rest-server + - ws-server ports: - ${CODALAB_HTTP_PORT}:80 volumes: From 2a067a4b1597998fda9d889416e2506334908813 Mon Sep 17 00:00:00 2001 From: AndrewJGaut Date: Tue, 6 Dec 2022 20:59:05 -0800 Subject: [PATCH 2/3] another fix --- docker_config/compose_files/files/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_config/compose_files/files/nginx.conf b/docker_config/compose_files/files/nginx.conf index e43d780cd..298d1bfa1 100644 --- a/docker_config/compose_files/files/nginx.conf +++ b/docker_config/compose_files/files/nginx.conf @@ -119,7 +119,7 @@ http { if ($maintenance = 1) { return 503; } - proxy_pass http://ws-server; + proxy_pass http://ws; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Host $http_host; proxy_http_version 1.1; From 30ba5bf6aac8dd08f54b03c500bd1953fa011847 Mon Sep 17 00:00:00 2001 From: AndrewJGaut Date: Tue, 6 Dec 2022 21:25:50 -0800 Subject: [PATCH 3/3] Fix mislabel in nginx.conf.ssl file --- docker_config/compose_files/files/nginx.conf.ssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_config/compose_files/files/nginx.conf.ssl b/docker_config/compose_files/files/nginx.conf.ssl index e74ab36f2..a526aaa72 100644 --- a/docker_config/compose_files/files/nginx.conf.ssl +++ b/docker_config/compose_files/files/nginx.conf.ssl @@ -134,7 +134,7 @@ http { if ($maintenance = 1) { return 503; } - proxy_pass http://backend; + proxy_pass http://ws; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Host $http_host; proxy_http_version 1.1;