From 427b596752bc14d1860ea891b3a7f82edcc3644b Mon Sep 17 00:00:00 2001 From: Shruti Chaturvedi Date: Thu, 19 Jan 2023 18:35:12 +0530 Subject: [PATCH 1/7] uffizzi --- docker-compose.uffizzi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.uffizzi.yml b/docker-compose.uffizzi.yml index deca90a6fc..cab9ac4cb9 100644 --- a/docker-compose.uffizzi.yml +++ b/docker-compose.uffizzi.yml @@ -9,6 +9,7 @@ x-uffizzi: deploy_preview_when_pull_request_is_opened: true delete_preview_when_pull_request_is_closed: true share_to_github: true + services: postgres: From cd5228f2b3be5e78b7e213f354ee2554f85e5c26 Mon Sep 17 00:00:00 2001 From: Shruti Chaturvedi Date: Thu, 19 Jan 2023 18:40:34 +0530 Subject: [PATCH 2/7] uffizzi --- nginx-uffizzi/nginx.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/nginx-uffizzi/nginx.conf b/nginx-uffizzi/nginx.conf index 6ceab7c4e8..07a7789fe9 100644 --- a/nginx-uffizzi/nginx.conf +++ b/nginx-uffizzi/nginx.conf @@ -4,7 +4,6 @@ events { http { server { - listen 8081; location / { From 94564118a25630af4816b9d62f25103b111b49cc Mon Sep 17 00:00:00 2001 From: Shruti Chaturvedi Date: Fri, 20 Jan 2023 11:19:39 +0530 Subject: [PATCH 3/7] Integrate Uffizzi --- docker-compose.uffizzi.yml | 2 +- nginx-uffizzi/nginx.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.uffizzi.yml b/docker-compose.uffizzi.yml index cab9ac4cb9..385b580e08 100644 --- a/docker-compose.uffizzi.yml +++ b/docker-compose.uffizzi.yml @@ -70,7 +70,7 @@ services: image: nginx:alpine volumes: - ./nginx-uffizzi:/etc/nginx - - ./nginx-uffizzi/html:/usr/share/nginx/html + # - ./nginx-uffizzi/html:/usr/share/nginx/html volumes: postgres_data: diff --git a/nginx-uffizzi/nginx.conf b/nginx-uffizzi/nginx.conf index 07a7789fe9..c15e57a2ec 100644 --- a/nginx-uffizzi/nginx.conf +++ b/nginx-uffizzi/nginx.conf @@ -7,8 +7,8 @@ http { listen 8081; location / { - root /usr/share/nginx/html; - index index.html index.htm; + default_type text/html; + return 200 "Click to Visit Parse Dashboard\n"; } location /dashboard { From fe690a5a9acf03aeb8b1e48452a6d7182f1af386 Mon Sep 17 00:00:00 2001 From: Shruti Chaturvedi Date: Fri, 20 Jan 2023 11:35:12 +0530 Subject: [PATCH 4/7] Integrate Uffizzi --- nginx-uffizzi/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-uffizzi/nginx.conf b/nginx-uffizzi/nginx.conf index c15e57a2ec..a4ef74b7b0 100644 --- a/nginx-uffizzi/nginx.conf +++ b/nginx-uffizzi/nginx.conf @@ -8,7 +8,7 @@ http { location / { default_type text/html; - return 200 "Click to Visit Parse Dashboard\n"; + return 200 "Click to Visit Parse Dashboard\n"; } location /dashboard { From 7634fdd42667c8512e004e9a9226daaa4d9f63f8 Mon Sep 17 00:00:00 2001 From: Shruti Chaturvedi Date: Fri, 20 Jan 2023 11:46:58 +0530 Subject: [PATCH 5/7] Integrate Uffizzi --- docker-compose.uffizzi.yml | 2 +- nginx-uffizzi/nginx.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.uffizzi.yml b/docker-compose.uffizzi.yml index 385b580e08..cab9ac4cb9 100644 --- a/docker-compose.uffizzi.yml +++ b/docker-compose.uffizzi.yml @@ -70,7 +70,7 @@ services: image: nginx:alpine volumes: - ./nginx-uffizzi:/etc/nginx - # - ./nginx-uffizzi/html:/usr/share/nginx/html + - ./nginx-uffizzi/html:/usr/share/nginx/html volumes: postgres_data: diff --git a/nginx-uffizzi/nginx.conf b/nginx-uffizzi/nginx.conf index a4ef74b7b0..07a7789fe9 100644 --- a/nginx-uffizzi/nginx.conf +++ b/nginx-uffizzi/nginx.conf @@ -7,8 +7,8 @@ http { listen 8081; location / { - default_type text/html; - return 200 "Click to Visit Parse Dashboard\n"; + root /usr/share/nginx/html; + index index.html index.htm; } location /dashboard { From 48c8b49d71121d6c35743944e9e1fc393b860595 Mon Sep 17 00:00:00 2001 From: Shruti Chaturvedi Date: Fri, 20 Jan 2023 11:57:17 +0530 Subject: [PATCH 6/7] Integrate Uffizzi --- docker-compose.uffizzi.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.uffizzi.yml b/docker-compose.uffizzi.yml index cab9ac4cb9..7d2805a5ce 100644 --- a/docker-compose.uffizzi.yml +++ b/docker-compose.uffizzi.yml @@ -60,7 +60,6 @@ services: command: - "-c" - "PARSE_DASHBOARD_SERVER_URL=$$UFFIZZI_URL/parse node Parse-Dashboard/index.js" - #- PARSE_DASHBOARD_COOKIE_SESSION_SECRET=AB8849B6-D725-4A75-AA73-AB7103F0363F deploy: resources: limits: From d333ca334d51571071dd8cfa1b8fe16886c49b22 Mon Sep 17 00:00:00 2001 From: Shruti Chaturvedi Date: Fri, 20 Jan 2023 12:17:09 +0530 Subject: [PATCH 7/7] Integrate Uffizzi --- nginx-uffizzi/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx-uffizzi/nginx.conf b/nginx-uffizzi/nginx.conf index 07a7789fe9..934681fde0 100644 --- a/nginx-uffizzi/nginx.conf +++ b/nginx-uffizzi/nginx.conf @@ -4,6 +4,7 @@ events { http { server { + listen 8081; location / {