From 74b825ae87055467a1ecb016215acf88a641a28e Mon Sep 17 00:00:00 2001
From: Oliver Yuan <yuan.zg@91t.com>
Date: Tue, 4 Jul 2023 09:55:37 +0800
Subject: [PATCH] [IMP] Improve docker-compose.yml

---
 docker-compose.yml | 52 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1d32b83..c30c963 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,20 +37,40 @@ services:
       - traefik-docker_default
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.ospp_cloud.rule=Host(`${CLOUD_DOMAIN}`)"
-      - "traefik.http.routers.ospp_cloud.service=ospp_cloud"
-      - "traefik.http.services.ospp_cloud.loadbalancer.server.port=8069"
-      - "traefik.http.middlewares.ospp_cloud.compress=true"
-      - "traefik.http.routers.ospp_cloud_im.rule=Host(`${CLOUD_DOMAIN}`) && PathPrefix(`/websocket`)"
-      - "traefik.http.routers.ospp_cloud_im.service=ospp_cloud_im"
-      - "traefik.http.services.ospp_cloud_im.loadbalancer.server.port=8072"
-      - "traefik.http.services.ospp_cloud_im.loadbalancer.passHostHeader=true"
-      - "traefik.http.middlewares.ospp_cloud_im.compress=true"
-      - "traefik.http.middlewares.ospp_cloud_im.headers.contentSecurityPolicy=upgrade-insecure-requests"
-      - "traefik.http.middlewares.ospp_cloud_im.headers.customResponseHeaders.Content-Security-Policy=upgrade-insecure-requests"
-      - "traefik.http.middlewares.ospp_cloud_im.headers.customResponseHeaders.Content-Security-Policy-Report-Only=upgrade-insecure-requests"
-      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Upgrade=websocket,keep-alive"
-      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Connection=upgrade"
-      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Sec-WebSocket-Version=13"
-      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.X-Forwarded-Proto=https,wss"
+
+      - "traefik.http.routers.saas.rule=Host(`${CLOUD_DOMAIN}`)"
+      - "traefik.http.routers.saas.service=saas"
+      - "traefik.http.services.saas.loadbalancer.server.port=8069"
+      - "traefik.http.middlewares.saas.compress=true"
+
+      - "traefik.http.routers.im.entrypoints=websecure"
+      - "traefik.http.routers.im.rule=Host(`${CLOUD_DOMAIN}`) && PathPrefix(`/websocket`)"
+      - "traefik.http.routers.im.middlewares=upgradeheader, gzip, sslheader"
+      - "traefik.http.routers.im.tls=true"
+      - "traefik.http.routers.im.service=im"
+      - "traefik.http.services.im.loadbalancer.server.port=8072"
+
+      - "traefik.http.middlewares.upgradeheader.headers.customrequestheaders.Upgrade=websocket"
+      - "traefik.http.middlewares.upgradeheader.headers.customrequestheaders.Connection=Upgrade"
+      - "traefik.http.middlewares.upgradeheader.headers.customrequestheaders=websocket,Upgrade"
+      - "traefik.http.middlewares.upgradeheader.headers.forcestsheader=true"
+      - "traefik.http.middlewares.sslheader.headers.customrequestheaders.X-Forwarded-Proto=https"
+      - "traefik.http.middlewares.gzip.compress=true"
+
+#      - "traefik.http.routers.ospp_cloud.rule=Host(`${CLOUD_DOMAIN}`)"
+#      - "traefik.http.routers.ospp_cloud.service=ospp_cloud"
+#      - "traefik.http.services.ospp_cloud.loadbalancer.server.port=8069"
+#      - "traefik.http.middlewares.ospp_cloud.compress=true"
+#      - "traefik.http.routers.ospp_cloud_im.rule=Host(`${CLOUD_DOMAIN}`) && PathPrefix(`/websocket`)"
+#      - "traefik.http.routers.ospp_cloud_im.service=ospp_cloud_im"
+#      - "traefik.http.services.ospp_cloud_im.loadbalancer.server.port=8072"
+#      - "traefik.http.services.ospp_cloud_im.loadbalancer.passHostHeader=true"
+#      - "traefik.http.middlewares.ospp_cloud_im.compress=true"
+#      - "traefik.http.middlewares.ospp_cloud_im.headers.contentSecurityPolicy=upgrade-insecure-requests"
+#      - "traefik.http.middlewares.ospp_cloud_im.headers.customResponseHeaders.Content-Security-Policy=upgrade-insecure-requests"
+#      - "traefik.http.middlewares.ospp_cloud_im.headers.customResponseHeaders.Content-Security-Policy-Report-Only=upgrade-insecure-requests"
+#      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Upgrade=websocket,keep-alive"
+#      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Connection=upgrade"
+#      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.Sec-WebSocket-Version=13"
+#      - "traefik.http.middlewares.ospp_cloud_im.headers.customrequestheaders.X-Forwarded-Proto=https,wss"