Skip to content

Commit 26eaba7

Browse files
AmitKumar-AKAmitKumar-AK
authored
Changes done for Sitecore 10.4.0 and LTSC2022 (#72)
* Changes done for Sitecore 10.4.0 and LTSC2022 * Changes done for the Sitecore Identity Server 8.0 based on the https://scdp.blob.core.windows.net/downloads/Sitecore%20Identity/8x/Sitecore_Identity_Server_8016/Sitecore_Identity_Server_Upgrade-DockerCompose-8.0.pdf * Changes done for SI 8.0 and Tools 10.4 image.
1 parent 1d37cab commit 26eaba7

19 files changed

Lines changed: 547 additions & 45 deletions

‎GettingStartedSetup/SetupDependecies/run/sitecore-xm1/docker-compose.override.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Note that some of the overrides point to 'empty' Dockerfiles. This is recommended, even if
55
# you are not customizing an image, to enable retagging and later customization. See Sitecore
66
# Containers documentation for details.
7-
#
7+
# refer .env details at https://github.com/AmitKumar-AK/Sitecore-XM0-Topology/tree/feature/10-4-XM0-HEADLESS-SXA/run
88

99
version: "2.4"
1010

@@ -77,7 +77,7 @@ services:
7777
build:
7878
context: ../../docker/build/redis
7979
args:
80-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-redis:${SITECORE_VERSION}
80+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX}
8181

8282
# Mount our SQL data folder and use our custom image with the Headless Services (JSS)
8383
# module data added. See Dockerfile for details.
@@ -116,11 +116,11 @@ services:
116116
# Use our retagged Identity Server image.
117117
# Configure for a mounted license file instead of using SITECORE_LICENSE.
118118
id:
119-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id6:${VERSION:-latest}
119+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id8:${VERSION:-latest}
120120
build:
121121
context: ../../docker/build/id
122122
args:
123-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
123+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-identity:${SITECORE_ID_VERSION}
124124
volumes:
125125
- ${HOST_LICENSE_FOLDER}:c:\license
126126
environment:
@@ -136,7 +136,7 @@ services:
136136
args:
137137
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION}
138138
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
139-
TOOLS_IMAGE: ${TOOLS_IMAGE}
139+
TOOLS_IMAGE: ${SITECORE_TOOLS_REGISTRY}sitecore-docker-tools-assets:${TOOLS_VERSION}
140140
MANAGEMENT_SERVICES_IMAGE: ${MANAGEMENT_SERVICES_IMAGE}
141141
HEADLESS_SERVICES_IMAGE: ${HEADLESS_SERVICES_IMAGE}
142142
depends_on:
@@ -157,7 +157,7 @@ services:
157157
args:
158158
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
159159
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
160-
TOOLS_IMAGE: ${TOOLS_IMAGE}
160+
TOOLS_IMAGE: ${SITECORE_TOOLS_REGISTRY}sitecore-docker-tools-assets:${TOOLS_VERSION}
161161
MANAGEMENT_SERVICES_IMAGE: ${MANAGEMENT_SERVICES_IMAGE}
162162
HEADLESS_SERVICES_IMAGE: ${HEADLESS_SERVICES_IMAGE}
163163
depends_on:

‎GettingStartedSetup/SetupDependecies/run/sitecore-xp0/docker-compose.override.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Note that some of the overrides point to 'empty' Dockerfiles. This is recommended, even if
55
# you are not customizing an image, to enable retagging and later customization. See Sitecore
66
# Containers documentation for details.
7-
#
7+
# refer .env details at https://github.com/AmitKumar-AK/Sitecore-XM0-Topology/tree/feature/10-4-XM0-HEADLESS-SXA/run
88

99
version: "2.4"
1010

@@ -108,11 +108,11 @@ services:
108108
# Use our retagged Identity Server image.
109109
# Configure for a mounted license file instead of using SITECORE_LICENSE.
110110
id:
111-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id6:${VERSION:-latest}
111+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id8:${VERSION:-latest}
112112
build:
113113
context: ../../docker/build/id
114114
args:
115-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
115+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-identity:${SITECORE_ID_VERSION}
116116
volumes:
117117
- ${HOST_LICENSE_FOLDER}:c:\license
118118
environment:
@@ -128,7 +128,7 @@ services:
128128
args:
129129
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp0-cm:${SITECORE_VERSION}
130130
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
131-
TOOLS_IMAGE: ${TOOLS_IMAGE}
131+
TOOLS_IMAGE: ${SITECORE_TOOLS_REGISTRY}sitecore-docker-tools-assets:${TOOLS_VERSION}
132132
MANAGEMENT_SERVICES_IMAGE: ${MANAGEMENT_SERVICES_IMAGE}
133133
HEADLESS_SERVICES_IMAGE: ${HEADLESS_SERVICES_IMAGE}
134134
depends_on:

‎GettingStartedSetup/SetupDependecies/run/sitecore-xp1/docker-compose.override.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Note that some of the overrides point to 'empty' Dockerfiles. This is recommended, even if
55
# you are not customizing an image, to enable retagging and later customization. See Sitecore
66
# Containers documentation for details.
7-
#
7+
# refer .env details at https://github.com/AmitKumar-AK/Sitecore-XM0-Topology/tree/feature/10-4-XM0-HEADLESS-SXA/run
88

99
version: "2.4"
1010

@@ -77,7 +77,7 @@ services:
7777
build:
7878
context: ../../docker/build/redis
7979
args:
80-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-redis:${SITECORE_VERSION}
80+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX}
8181

8282
# Mount our SQL data folder and use our custom image with the Headless Services (JSS)
8383
# module data added. See Dockerfile for details.
@@ -116,11 +116,11 @@ services:
116116
# Use our retagged Identity Server image.
117117
# Configure for a mounted license file instead of using SITECORE_LICENSE.
118118
id:
119-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id6:${VERSION:-latest}
119+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id8:${VERSION:-latest}
120120
build:
121121
context: ../../docker/build/id
122122
args:
123-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
123+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-identity:${SITECORE_ID_VERSION}
124124
volumes:
125125
- ${HOST_LICENSE_FOLDER}:c:\license
126126
environment:
@@ -136,7 +136,7 @@ services:
136136
args:
137137
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-cd:${SITECORE_VERSION}
138138
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
139-
TOOLS_IMAGE: ${TOOLS_IMAGE}
139+
TOOLS_IMAGE: ${SITECORE_TOOLS_REGISTRY}sitecore-docker-tools-assets:${TOOLS_VERSION}
140140
MANAGEMENT_SERVICES_IMAGE: ${MANAGEMENT_SERVICES_IMAGE}
141141
HEADLESS_SERVICES_IMAGE: ${HEADLESS_SERVICES_IMAGE}
142142
depends_on:
@@ -157,7 +157,7 @@ services:
157157
args:
158158
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-cm:${SITECORE_VERSION}
159159
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
160-
TOOLS_IMAGE: ${TOOLS_IMAGE}
160+
TOOLS_IMAGE: ${SITECORE_TOOLS_REGISTRY}sitecore-docker-tools-assets:${TOOLS_VERSION}
161161
MANAGEMENT_SERVICES_IMAGE: ${MANAGEMENT_SERVICES_IMAGE}
162162
HEADLESS_SERVICES_IMAGE: ${HEADLESS_SERVICES_IMAGE}
163163
depends_on:

‎custom-images/.env‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ ID_HOST=id.dockerexamples.localhost
2222
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
2323
SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
2424
SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/
25-
SITECORE_VERSION=10.3.1-ltsc2019
26-
TOOLS_VERSION=10.3.0-1809
27-
SPE_VERSION=6.4.0.65-1809
28-
SXA_VERSION=10.3-1809
29-
EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2019
25+
SITECORE_VERSION=10.4.0-ltsc2022
26+
TOOLS_VERSION=10.4.0-ltsc2022
27+
SPE_VERSION=7.0-ltsc2022
28+
SXA_VERSION=10.4.0-ltsc2022
29+
EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2022
3030

3131
SITECORE_ADMIN_PASSWORD=
3232
REPORTING_API_KEY=
@@ -52,4 +52,5 @@ SQL_SA_PASSWORD=
5252
SQL_CUSTOM_DATABASE_PREFIX_UPDATE_FROM=
5353
SQL_DATABASE_PREFIX=Sitecore
5454

55-
HOST_LICENSE_FOLDER=C:\License
55+
HOST_LICENSE_FOLDER=C:\license
56+
SITECORE_ID_VERSION=8.0-ltsc2022

‎custom-images/Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<PlatformVersion>10.3.0</PlatformVersion>
4+
<PlatformVersion>10.4.0</PlatformVersion>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Update="Sitecore.XConnect" Version="$(PlatformVersion)" />

‎custom-images/clean-install.ps1‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,25 @@ else {
5858
docker-compose up -d
5959
}
6060

61+
# Wait for Traefik to expose CM route
62+
Write-Host "Waiting for CM to become available..." -ForegroundColor Green
63+
$startTime = Get-Date
64+
do {
65+
Start-Sleep -Milliseconds 100
66+
try {
67+
$status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-secure@docker"
68+
} catch {
69+
if ($_.Exception.Response.StatusCode.value__ -ne "404") {
70+
throw
71+
}
72+
}
73+
} while ($status.status -ne "enabled" -and $startTime.AddSeconds(15) -gt (Get-Date))
74+
if (-not $status.status -eq "enabled") {
75+
$status
76+
Write-Error "Timeout waiting for Sitecore CM to become available via Traefik proxy. Check CM container logs."
77+
}
78+
79+
# Execute the Sitecore Identity Server 8 upgrade script
80+
.\execute-mssql-script.ps1 -filePath ".env"
81+
6182
Write-Host "***Setup completed successfully***" -ForegroundColor Green

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ services:
4343
SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sitecore-sxa-xp1-assets:${SXA_VERSION}
4444

4545
id:
46-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
46+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id8:${VERSION:-latest}
4747
build:
4848
context: ./docker/build/id
4949
args:
50-
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
50+
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-identity:${SITECORE_ID_VERSION}
5151
volumes:
5252
- ${HOST_LICENSE_FOLDER}:c:\license
5353
environment:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ services:
5050
SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sitecore-sxa-xm1-assets:${SXA_VERSION}
5151

5252
id:
53-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
53+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id8:${VERSION:-latest}
5454
build:
5555
context: ./docker/build/id
5656
args:
57-
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
57+
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-identity:${SITECORE_ID_VERSION}
5858
volumes:
5959
- ${HOST_LICENSE_FOLDER}:c:\license
6060
environment:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
image: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX}
3333
mssql:
3434
isolation: ${ISOLATION}
35-
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${EXTERNAL_IMAGE_TAG_SUFFIX}
35+
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX}
3636
environment:
3737
SA_PASSWORD: ${SQL_SA_PASSWORD}
3838
ACCEPT_EULA: "Y"
@@ -97,9 +97,9 @@ services:
9797
condition: service_healthy
9898
id:
9999
isolation: ${ISOLATION}
100-
image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
100+
image: ${SITECORE_DOCKER_REGISTRY}sitecore-identity:${SITECORE_ID_VERSION}
101101
environment:
102-
Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
102+
Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};Encrypt=true;TrustServerCertificate=true;
103103
Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
104104
Sitecore_Sitecore__IdentityServer__Clients__PasswordClient__ClientSecrets__ClientSecret1: ${SITECORE_IDSECRET}
105105
Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1: https://${CM_HOST}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ services:
5050
SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sitecore-sxa-xp1-assets:${SXA_VERSION}
5151

5252
id:
53-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
53+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id8:${VERSION:-latest}
5454
build:
5555
context: ./docker/build/id
5656
args:
57-
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
57+
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-identity:${SITECORE_ID_VERSION}
5858
volumes:
5959
- ${HOST_LICENSE_FOLDER}:c:\license
6060
environment:

0 commit comments

Comments
 (0)