Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove useless ENV Variables #477

Merged
merged 7 commits into from
Dec 19, 2024
Merged

Remove useless ENV Variables #477

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0941f8e
Remove useless ENV Variables
gkLeo Jul 23, 2024
3fafca7
Add http router for Events site
gkLeo Jul 23, 2024
4804f62
Merge branch 'main' into fix/template
gkLeo Sep 30, 2024
23458e2
resolve merge conflict
gkLeo Sep 30, 2024
e85d5ed
Fixed typo
gkLeo Sep 30, 2024
b15186b
merge conflict
gkLeo Dec 2, 2024
9cb5557
update MVP_RENDERING_EDITING_HOST_URI
gkLeo Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions authoring/items/Sugcon2024/Sugcon/Sugcon/SiteEvents/Events/Settings/Site Grouping/Events.yml
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why has this file needed to be changed alongside the .env changes?

Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
7 changes: 2 additions & 5 deletions local-containers/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
20 changes: 8 additions & 12 deletions local-containers/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`)"
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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"
Loading