Remove useless ENV Variables (#477)

* Remove useless ENV Variables * Add http router for Events site * resolve merge conflict * Fixed typo * update MVP_RENDERING_EDITING_HOST_URI
Sitecore · Dec 19, 2024 · 16fe7bb · 16fe7bb
1 parent e3ecc52
commit 16fe7bb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/authoring/items/Sugcon2024/Sugcon/Sugcon/SiteEvents/Events/Settings/Site Grouping/Events.yml b/authoring/items/Sugcon2024/Sugcon/Sugcon/SiteEvents/Events/Settings/Site Grouping/Events.yml
@@ -16,7 +16,7 @@ SharedFields:
   Value: Events
 - ID: "8e0dd914-9afb-4d45-bf8b-7ff5d6e5337e"
   Hint: HostName
-  Value: sugcon24events.vercel.app
+  Value: sugcon24events.vercel.app|sugconevents.xmcloudcm.localhost
 - ID: "9eaf6dc9-b811-4cda-9edd-9697faba628a"
   Hint: POS
   Value: 
@@ -56,11 +56,11 @@ Languages:
         sitecore\[email protected]
     - ID: "8cdc337e-a112-42fb-bbb4-4143751e123f"
       Hint: __Revision
-      Value: "1cb3429c-ba89-41c4-b849-305efdf6c60f"
+      Value: "93f01196-f868-4237-a784-fc5be52a0fc9"
     - ID: "badd9cf9-53e0-4d0c-bcc0-2d784c282f6a"
       Hint: __Updated by
       Value: |
-        sitecore\[email protected]
+        sitecore\LsPuHOnvmf
     - ID: "d9cf14b1-fa16-4ba6-9288-e8a174d4d522"
       Hint: __Updated
-      Value: 20240502T074259Z
+      Value: 20240723T084834Z
diff --git a/local-containers/.env.template b/local-containers/.env.template
@@ -5,15 +5,12 @@ COMPOSE_PROJECT_NAME=xm-cloud-introduction
 # Configure host names, which will be used to configure Traefik proxy routing.
 CM_HOST=xmcloudcm.localhost
 MVP_RENDERING_HOST=mvp.xmcloudcm.localhost
+SUGCON_EVENTS_HOST=sugconevents.xmcloudcm.localhost
 SUGCON_EU_HOST=sugconeu.xmcloudcm.localhost
-SUGCON_EU_HOST_INTERNAL_URI=http://sugconeu:3000
 SUGCON_ANZ_HOST=sugconanz.xmcloudcm.localhost
-SUGCON_ANZ_HOST_INTERNAL_URI=http://sugconanz:3000
 SUGCON_INDIA_HOST=sugconindia.xmcloudcm.localhost
-SUGCON_INDIA_HOST_INTERNAL_URI=http://sugconindia:3000
 SUGCON_NA_HOST=sugconna.xmcloudcm.localhost
-SUGCON_NA_HOST_INTERNAL_URI=http://sugconna:3000
-RENDERING_HOST_INTERNAL_URI=http://sugconanz:3000
+RENDERING_HOST_INTERNAL_URI=http://mvp-rendering
 NODE_ENV=development
 
 # Sitecore Docker registry and platform version.

diff --git a/local-containers/docker-compose.override.yml b/local-containers/docker-compose.override.yml
@@ -36,9 +36,12 @@ services:
       - nodejs
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.sugoneu-secure.entrypoints=websecure"
-      - "traefik.http.routers.sugoneu-secure.tls=true"
-      - "traefik.http.routers.sugoneu-secure.rule=Host(`${SUGCON_EU_HOST}`)"
+      - "traefik.http.routers.sugconevents-secure.entrypoints=websecure"
+      - "traefik.http.routers.sugconevents-secure.tls=true"
+      - "traefik.http.routers.sugconevents-secure.rule=Host(`${SUGCON_EVENTS_HOST}`)"
+      - "traefik.http.routers.sugconeu-secure.entrypoints=websecure"
+      - "traefik.http.routers.sugconeu-secure.tls=true"
+      - "traefik.http.routers.sugconeu-secure.rule=Host(`${SUGCON_EU_HOST}`)"
       - "traefik.http.routers.sugconanz-secure.entrypoints=websecure"
       - "traefik.http.routers.sugconanz-secure.tls=true"  
       - "traefik.http.routers.sugconanz-secure.rule=Host(`${SUGCON_ANZ_HOST}`)"
@@ -69,7 +72,7 @@ services:
       ASPNETCORE_URLS: "http://*:80"
       DOTNET_WATCH_RESTART_ON_RUDE_EDIT: true
       DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER: true
-      MVP_RENDERING_EDITING_HOST_URI: "http://mvp-rendering"
+      MVP_RENDERING_EDITING_HOST_URI: ${RENDERING_HOST_INTERNAL_URI}
       Sitecore__EnableLocalContainer: "true"
       Sitecore__LocalContainerLayoutUri: "http://cm/sitecore/api/graph/edge"
       Sitecore__EdgeContextId: "{E2F3D43E-B1FD-495E-B4B1-84579892422A}"
@@ -145,17 +148,10 @@ services:
       SITECORE_Pages_Client_Host: ${SITECORE_Pages_Client_Host}
       SITECORE_Pages_CORS_Allowed_Origins: ${SITECORE_Pages_CORS_Allowed_Origins}
       SITECORE_GraphQL_CORS: ${SITECORE_GRAPHQL_CORS}
-      ## SugconEu Rendering Host
-      SUGCONEU_RENDERING_HOST_ENDPOINT_URI: "${SUGCON_EU_HOST_INTERNAL_URI}/api/editing/render"
-      SUGCONEU_RENDERING_HOST_PUBLIC_URI: "https://${SUGCON_EU_HOST}"
-      ## SugconAnzsugcon/ Rendering Host
-      SUGCONANZ_RENDERING_HOST_ENDPOINT_URI: "${SUGCON_ANZ_HOST_INTERNAL_URI}/api/editing/render"
-      SUGCONANZ_RENDERING_HOST_PUBLIC_URI: "https://${SUGCON_ANZ_HOST}"
       ## MVP Rendering Host
       MVP_RENDERING_HOST_PUBLIC_URI: "https://${MVP_RENDERING_HOST}"
       ## Development Environment Optimizations
       SITECORE_DEVELOPMENT_PATCHES: DevEnvOn,CustomErrorsOff,DebugOn,DiagnosticsOff,InitMessagesOff
       Sitecore_AppSettings_exmEnabled:define: "no" # remove to turn on EXM
-      MVP_RENDERING_EDITING_HOST_URI: "http://mvp-rendering/"
-      RENDERING_HOST_INTERNAL_URI: ${SUGCON_EU_HOST_INTERNAL_URI}
+      MVP_RENDERING_EDITING_HOST_URI: "${RENDERING_HOST_INTERNAL_URI}/"
     entrypoint: powershell -Command "& C:/tools/entrypoints/iis/XmCloudDevelopment.ps1"