From 54e76d84967636198b79b477eb32f062a22b5c79 Mon Sep 17 00:00:00 2001
From: Shruti Chaturvedi <shrutichaturvedi16.sc@gmail.com>
Date: Wed, 18 Jan 2023 21:51:16 +0530
Subject: [PATCH 1/3] integrate uffizzi

---
 docker-compose.uffizzi.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docker-compose.uffizzi.yml b/docker-compose.uffizzi.yml
index a9873aa833..674fdc10fe 100644
--- a/docker-compose.uffizzi.yml
+++ b/docker-compose.uffizzi.yml
@@ -3,11 +3,10 @@ version: '3'
 # uffizzi integration
 x-uffizzi:
   ingress:
-    service: nginx
-    port: 8081
+    service: dashboard
+    port: 4040
 
 services:
-
   postgres:
       image: postgres
       environment:
@@ -37,8 +36,11 @@ services:
           resources:
             limits:
               memory: 1000M
+
   dashboard:
-        image: "${PARSE_DASHBOARD_IMAGE}"
+        build:
+          context: .
+          dockerfile: ./Dockerfile
         ports:
             - "4040:4040"
         environment:
@@ -49,11 +51,12 @@ services:
         - PARSE_DASHBOARD_USER_PASSWORD=password
         - MOUNT_PATH=/dashboard
         - PARSE_DASHBOARD_ALLOW_INSECURE_HTTP=1
+        # - TRUST_PROXY=1
+        - PARSE_DASHBOARD_SERVER_URL=http://127.0.0.1:1337/parse - ERR CONN REFUSED
         entrypoint: /bin/sh
         command:
          - "-c"
-         - "PARSE_DASHBOARD_SERVER_URL=$$UFFIZZI_URL/parse node Parse-Dashboard/index.js"
-        #- PARSE_DASHBOARD_COOKIE_SESSION_SECRET=AB8849B6-D725-4A75-AA73-AB7103F0363F
+         - "export PARSE_DASHBOARD_SERVER_URL=$$UFFIZZI_URL/parse && node Parse-Dashboard/index.js"
         deploy:
           resources:
             limits:
@@ -67,4 +70,3 @@ services:
 
 volumes:
   postgres_data:
-

From f2eb3212e4c980117781ea2efae1469c7b288c85 Mon Sep 17 00:00:00 2001
From: Shruti Chaturvedi <shrutichaturvedi16.sc@gmail.com>
Date: Wed, 18 Jan 2023 21:56:43 +0530
Subject: [PATCH 2/3] integrate

---
 docker-compose.uffizzi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.uffizzi.yml b/docker-compose.uffizzi.yml
index 674fdc10fe..e063f3be4d 100644
--- a/docker-compose.uffizzi.yml
+++ b/docker-compose.uffizzi.yml
@@ -52,7 +52,7 @@ services:
         - MOUNT_PATH=/dashboard
         - PARSE_DASHBOARD_ALLOW_INSECURE_HTTP=1
         # - TRUST_PROXY=1
-        - PARSE_DASHBOARD_SERVER_URL=http://127.0.0.1:1337/parse - ERR CONN REFUSED
+        - PARSE_DASHBOARD_SERVER_URL=http://127.0.0.1:1337/parse
         entrypoint: /bin/sh
         command:
          - "-c"

From f5440ab142a2a5f76e3c185e9e1230d32c0d2c9f Mon Sep 17 00:00:00 2001
From: Shruti Chaturvedi <shrutichaturvedi16.sc@gmail.com>
Date: Wed, 18 Jan 2023 22:01:28 +0530
Subject: [PATCH 3/3] integrate

---
 docker-compose.uffizzi.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/docker-compose.uffizzi.yml b/docker-compose.uffizzi.yml
index e063f3be4d..be3297031d 100644
--- a/docker-compose.uffizzi.yml
+++ b/docker-compose.uffizzi.yml
@@ -3,10 +3,11 @@ version: '3'
 # uffizzi integration
 x-uffizzi:
   ingress:
-    service: dashboard
-    port: 4040
+    service: nginx
+    port: 8081
 
 services:
+
   postgres:
       image: postgres
       environment:
@@ -36,11 +37,8 @@ services:
           resources:
             limits:
               memory: 1000M
-
   dashboard:
-        build:
-          context: .
-          dockerfile: ./Dockerfile
+        image: "${PARSE_DASHBOARD_IMAGE}"
         ports:
             - "4040:4040"
         environment:
@@ -51,12 +49,11 @@ services:
         - PARSE_DASHBOARD_USER_PASSWORD=password
         - MOUNT_PATH=/dashboard
         - PARSE_DASHBOARD_ALLOW_INSECURE_HTTP=1
-        # - TRUST_PROXY=1
-        - PARSE_DASHBOARD_SERVER_URL=http://127.0.0.1:1337/parse
         entrypoint: /bin/sh
         command:
          - "-c"
-         - "export PARSE_DASHBOARD_SERVER_URL=$$UFFIZZI_URL/parse && node Parse-Dashboard/index.js"
+         - "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: