diff --git a/.env.template b/.env.template deleted file mode 100644 index e69de29b..00000000 diff --git a/docker-compose.override.yml b/docker-compose.override.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/local-containers/.env.template b/local-containers/.env.template index ff533026..f6dbc69c 100644 --- 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 index 482f0a25..c692124d 100644 --- a/local-containers/docker-compose.override.yml +++ b/local-containers/docker-compose.override.yml @@ -36,6 +36,9 @@ services: - nodejs labels: - "traefik.enable=true" + - "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.sugoneu-secure.entrypoints=websecure" - "traefik.http.routers.sugoneu-secure.tls=true" - "traefik.http.routers.sugoneu-secure.rule=Host(`${SUGCON_EU_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__InstanceUri: "http://cm" Sitecore__LayoutServicePath: "/sitecore/api/graph/edge" Sitecore__ExperienceEdgeToken: "{E2F3D43E-B1FD-495E-B4B1-84579892422A}" @@ -146,17 +149,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" \ No newline at end of file