From 331e4e62ce7bafd38513f1c4fc31b876daa1a612 Mon Sep 17 00:00:00 2001 From: Oliver Yuan Date: Wed, 8 Nov 2023 15:08:27 +0800 Subject: [PATCH] [IMP] Update docker-compose.yml! --- docker-compose.yml | 50 +++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4de46f8..2c7fec4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,9 @@ networks: external: true services: - enterprise_db: + university_db: image: postgres:16 - container_name: "enterprise_db" + container_name: "university_db" environment: - POSTGRES_DB=postgres - POSTGRES_USER=${DB_USER:-odoo} @@ -18,14 +18,14 @@ services: networks: - traefik-docker_default - enterprise_cloud: + university_cloud: build: context: ./ dockerfile: Dockerfile - image: enterprise:16 - container_name: "enterprise_cloud" + image: university:16 + container_name: "university_cloud" depends_on: - - enterprise_db + - university_db # ports: # - "8069:8069" # - "8072:8072" @@ -42,17 +42,17 @@ services: labels: - "traefik.enable=true" - - "traefik.http.routers.enterprise_cloud.rule=Host(`${CLOUD_DOMAIN}`)" - - "traefik.http.routers.enterprise_cloud.service=ospp_cloud" - - "traefik.http.services.enterprise_cloud.loadbalancer.server.port=8069" - - "traefik.http.middlewares.enterprise_cloud.compress=true" + - "traefik.http.routers.university_cloud.rule=Host(`${CLOUD_DOMAIN}`)" + - "traefik.http.routers.university_cloud.service=university_cloud" + - "traefik.http.services.university_cloud.loadbalancer.server.port=8069" + - "traefik.http.middlewares.university_cloud.compress=true" - - "traefik.http.routers.enterprise_cloud_im.entrypoints=websecure" - - "traefik.http.routers.enterprise_cloud_im.rule=Host(`${CLOUD_DOMAIN}`) && PathPrefix(`/websocket`)" - - "traefik.http.routers.enterprise_cloud_im.middlewares=upgradeheader, gzip, sslheader" - - "traefik.http.routers.enterprise_cloud_im.tls=true" - - "traefik.http.routers.enterprise_cloud_im.service=ospp_cloud_im" - - "traefik.http.services.enterprise_cloud_im.loadbalancer.server.port=8072" + - "traefik.http.routers.university_cloud_im.entrypoints=websecure" + - "traefik.http.routers.university_cloud_im.rule=Host(`${CLOUD_DOMAIN}`) && PathPrefix(`/websocket`)" + - "traefik.http.routers.university_cloud_im.middlewares=upgradeheader, gzip, sslheader" + - "traefik.http.routers.university_cloud_im.tls=true" + - "traefik.http.routers.university_cloud_im.service=university_cloud_im" + - "traefik.http.services.university_cloud_im.loadbalancer.server.port=8072" - "traefik.http.middlewares.upgradeheader.headers.customrequestheaders.Upgrade=websocket" - "traefik.http.middlewares.upgradeheader.headers.customrequestheaders.Connection=Upgrade" @@ -60,21 +60,3 @@ services: - "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" -