Skip to content

Commit c5cc834

Browse files
author
Eugene Grebeshkov
committed
PR followup
1 parent 31ce432 commit c5cc834

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎custom-images/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LOCAL_DATA_PATH=.\docker\data
1212
CD_HOST=cd.dockerexamples.localhost
1313
CM_HOST=cm.dockerexamples.localhost
1414
ID_HOST=id.dockerexamples.localhost
15-
AH_HOST=ah.dockerexamples.localhost
15+
HRZ_HOST=hrz.dockerexamples.localhost
1616

1717
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
1818
SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/

‎custom-images/docker-compose.override.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ services:
5050
args:
5151
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
5252
environment:
53-
Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${AH_HOST}
53+
Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${HRZ_HOST}
5454
cm:
5555
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp0-cm:${VERSION:-latest}
5656
build:
@@ -69,7 +69,7 @@ services:
6969
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
7070
environment:
7171
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
72-
Sitecore_Horizon_ClientHost: https://${AH_HOST}
72+
Sitecore_Horizon_ClientHost: https://${HRZ_HOST}
7373
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
7474

7575
xconnect:
@@ -128,7 +128,7 @@ services:
128128
Sitecore_SitecorePlatform__ContentManagementInternalUrl: http://cm
129129
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__RequireHttpsMetadata: 'false'
130130
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__Authority: https://${ID_HOST}
131-
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${AH_HOST}
131+
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${HRZ_HOST}
132132
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__InternalAuthority: http://id
133133
Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__Authority: https://${ID_HOST}
134134
Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__InternalAuthority: http://id
@@ -144,7 +144,7 @@ services:
144144
- "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
145145
- "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
146146
- "traefik.http.routers.sh-secure.entrypoints=websecure"
147-
- "traefik.http.routers.sh-secure.rule=Host(`${AH_HOST}`)"
147+
- "traefik.http.routers.sh-secure.rule=Host(`${HRZ_HOST}`)"
148148
- "traefik.http.routers.sh-secure.tls=true"
149149
- "traefik.http.routers.sh-secure.middlewares=force-STS-Header"
150150
- "traefik.http.services.sh.loadbalancer.server.port=80"

‎custom-images/docker-compose.xm1.override.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ services:
9393
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
9494
environment:
9595
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
96-
Sitecore_Horizon_ClientHost: https://${AH_HOST}
96+
Sitecore_Horizon_ClientHost: https://${HRZ_HOST}
9797
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
9898
hrz:
9999
image: ${SITECORE_MODULE_REGISTRY}sitecore-horizon:${HORIZON_VERSION}
@@ -108,7 +108,7 @@ services:
108108
Sitecore_SitecorePlatform__ContentManagementInternalUrl: http://cm
109109
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__RequireHttpsMetadata: 'false'
110110
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__Authority: https://${ID_HOST}
111-
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${AH_HOST}
111+
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${HRZ_HOST}
112112
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__InternalAuthority: http://id
113113
Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__Authority: https://${ID_HOST}
114114
Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__InternalAuthority: http://id
@@ -124,7 +124,7 @@ services:
124124
- "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
125125
- "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
126126
- "traefik.http.routers.sh-secure.entrypoints=websecure"
127-
- "traefik.http.routers.sh-secure.rule=Host(`${AH_HOST}`)"
127+
- "traefik.http.routers.sh-secure.rule=Host(`${HRZ_HOST}`)"
128128
- "traefik.http.routers.sh-secure.tls=true"
129129
- "traefik.http.routers.sh-secure.middlewares=force-STS-Header"
130130
- "traefik.http.services.sh.loadbalancer.server.port=80"

‎custom-images/docker-compose.xp1.override.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ services:
5757
args:
5858
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
5959
environment:
60-
Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${AH_HOST}
60+
Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup2: https://${HRZ_HOST}
6161

6262
cd:
6363
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-cd:${VERSION:-latest}
@@ -95,7 +95,7 @@ services:
9595
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
9696
environment:
9797
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
98-
Sitecore_Horizon_ClientHost: https://${AH_HOST}
98+
Sitecore_Horizon_ClientHost: https://${HRZ_HOST}
9999
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
100100

101101
prc:
@@ -209,7 +209,7 @@ services:
209209
Sitecore_SitecorePlatform__ContentManagementInternalUrl: http://cm
210210
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__RequireHttpsMetadata: 'false'
211211
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__Authority: https://${ID_HOST}
212-
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${AH_HOST}
212+
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__CallbackAuthority: https://${HRZ_HOST}
213213
Sitecore_Sitecore__Authentication__OpenIdConnectOptions__InternalAuthority: http://id
214214
Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__Authority: https://${ID_HOST}
215215
Sitecore_Sitecore__Authentication__BearerAuthenticationOptions__InternalAuthority: http://id
@@ -225,7 +225,7 @@ services:
225225
- "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
226226
- "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
227227
- "traefik.http.routers.sh-secure.entrypoints=websecure"
228-
- "traefik.http.routers.sh-secure.rule=Host(`${AH_HOST}`)"
228+
- "traefik.http.routers.sh-secure.rule=Host(`${HRZ_HOST}`)"
229229
- "traefik.http.routers.sh-secure.tls=true"
230230
- "traefik.http.routers.sh-secure.middlewares=force-STS-Header"
231231
- "traefik.http.services.sh.loadbalancer.server.port=80"

‎custom-images/init.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ Set-EnvFileVariable "CM_HOST" -Value "cm.$($HostName).localhost"
6868
# ID_HOST
6969
Set-EnvFileVariable "ID_HOST" -Value "id.$($HostName).localhost"
7070

71-
# AH_HOST
72-
Set-EnvFileVariable "AH_HOST" -Value "ah.$($HostName).localhost"
71+
# HRZ_HOST
72+
Set-EnvFileVariable "HRZ_HOST" -Value "hrz.$($HostName).localhost"
7373

7474
# REPORTING_API_KEY = random 64-128 chars
7575
Set-EnvFileVariable "REPORTING_API_KEY" -Value (Get-SitecoreRandomString 64 -DisallowSpecial)
@@ -131,6 +131,6 @@ Write-Host "Adding Windows hosts file entries..." -ForegroundColor Green
131131
Add-HostsEntry "cd.$($HostName).localhost"
132132
Add-HostsEntry "cm.$($HostName).localhost"
133133
Add-HostsEntry "id.$($HostName).localhost"
134-
Add-HostsEntry "ah.$($HostName).localhost"
134+
Add-HostsEntry "hrz.$($HostName).localhost"
135135

136136
Write-Host "Done!" -ForegroundColor Green

0 commit comments

Comments
 (0)