Skip to content

Commit 1d37cab

Browse files
AmitKumar-AKAmitKumar-AK
authored
Upgrade to Sitecore 10.3.1-ltsc2019 with mounted license (Sitecore#65)
* [Amit Kumar]: Changes done to upgrade to Sitecore 10.3.1-ltsc2019 with mounted license changes for requried Sitecore Services. * Add-HostsEntry removed for Horizon host * Review comment changes. * Write-host removed.
1 parent bf15c82 commit 1d37cab

5 files changed

Lines changed: 97 additions & 16 deletions

File tree

‎custom-images/.env‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ LOCAL_DATA_PATH=.\docker\data
1818
CD_HOST=cd.dockerexamples.localhost
1919
CM_HOST=cm.dockerexamples.localhost
2020
ID_HOST=id.dockerexamples.localhost
21-
HRZ_HOST=hrz.dockerexamples.localhost
2221

2322
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
2423
SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
2524
SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/
26-
SITECORE_VERSION=10.3-ltsc2019
27-
TOOLS_VERSION=10.2-1809
28-
SPE_VERSION=6.4-1809
25+
SITECORE_VERSION=10.3.1-ltsc2019
26+
TOOLS_VERSION=10.3.0-1809
27+
SPE_VERSION=6.4.0.65-1809
2928
SXA_VERSION=10.3-1809
3029
EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2019
3130

@@ -51,4 +50,6 @@ SQL_SERVER=mssql
5150
SQL_SA_LOGIN=sa
5251
SQL_SA_PASSWORD=
5352
SQL_CUSTOM_DATABASE_PREFIX_UPDATE_FROM=
54-
SQL_DATABASE_PREFIX=Sitecore
53+
SQL_DATABASE_PREFIX=Sitecore
54+
55+
HOST_LICENSE_FOLDER=C:\License

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ services:
4848
context: ./docker/build/id
4949
args:
5050
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
51-
51+
volumes:
52+
- ${HOST_LICENSE_FOLDER}:c:\license
53+
environment:
54+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
55+
5256
cm:
5357
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp0-cm:${VERSION:-latest}
5458
build:
@@ -65,8 +69,10 @@ services:
6569
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
6670
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
6771
- ${LOCAL_DATA_PATH}\devicedetection:C:\inetpub\wwwroot\App_Data\DeviceDetection
72+
- ${HOST_LICENSE_FOLDER}:c:\license
6873
environment:
6974
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
75+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
7076
entrypoint: powershell -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
7177

7278
xconnect:
@@ -81,6 +87,9 @@ services:
8187
- solution
8288
volumes:
8389
- ${LOCAL_DEPLOY_PATH}\xconnect:C:\deploy
90+
- ${HOST_LICENSE_FOLDER}:c:\license
91+
environment:
92+
SITECORE_LICENSE_LOCATION: c:\license\
8493
entrypoint: powershell -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
8594

8695
xdbsearchworker:
@@ -90,6 +99,10 @@ services:
9099
args:
91100
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp0-xdbsearchworker:${SITECORE_VERSION}
92101
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
102+
volumes:
103+
- ${HOST_LICENSE_FOLDER}:c:\license
104+
environment:
105+
SITECORE_LICENSE_LOCATION: c:\license\
93106
depends_on:
94107
- solution
95108

@@ -100,6 +113,10 @@ services:
100113
args:
101114
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp0-xdbautomationworker:${SITECORE_VERSION}
102115
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
116+
volumes:
117+
- ${HOST_LICENSE_FOLDER}:c:\license
118+
environment:
119+
SITECORE_LICENSE_LOCATION: c:\license\
103120
depends_on:
104121
- solution
105122

@@ -110,5 +127,9 @@ services:
110127
args:
111128
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp0-cortexprocessingworker:${SITECORE_VERSION}
112129
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
130+
volumes:
131+
- ${HOST_LICENSE_FOLDER}:c:\license
132+
environment:
133+
SITECORE_LICENSE_LOCATION: c:\license\
113134
depends_on:
114135
- solution

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ services:
5555
context: ./docker/build/id
5656
args:
5757
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
58-
58+
volumes:
59+
- ${HOST_LICENSE_FOLDER}:c:\license
60+
environment:
61+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
62+
5963
cd:
6064
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cd:${VERSION:-latest}
6165
build:
@@ -71,8 +75,10 @@ services:
7175
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
7276
- ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
7377
- ${LOCAL_DATA_PATH}\devicedetection:C:\inetpub\wwwroot\App_Data\DeviceDetection
78+
- ${HOST_LICENSE_FOLDER}:c:\license
7479
environment:
7580
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
81+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
7682
entrypoint: powershell -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
7783

7884
cm:
@@ -90,6 +96,8 @@ services:
9096
volumes:
9197
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
9298
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
99+
- ${HOST_LICENSE_FOLDER}:c:\license
93100
environment:
94101
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
102+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
95103
entrypoint: powershell -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"

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

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ services:
1515
volumes:
1616
- ./docker/traefik:C:/etc/traefik
1717

18-
redis:
18+
redis:
1919
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-redis:${VERSION:-latest}
2020
build:
2121
context: ./docker/build/redis
2222
args:
2323
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX}
2424

25-
2625
mssql:
2726
mem_limit: 2GB
2827
volumes:
@@ -56,6 +55,10 @@ redis:
5655
context: ./docker/build/id
5756
args:
5857
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
58+
volumes:
59+
- ${HOST_LICENSE_FOLDER}:c:\license
60+
environment:
61+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
5962

6063
cd:
6164
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-cd:${VERSION:-latest}
@@ -72,8 +75,10 @@ redis:
7275
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
7376
- ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
7477
- ${LOCAL_DATA_PATH}\devicedetection:C:\inetpub\wwwroot\App_Data\DeviceDetection
78+
- ${HOST_LICENSE_FOLDER}:c:\license
7579
environment:
7680
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
81+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
7782
entrypoint: powershell -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
7883

7984
cm:
@@ -91,8 +96,10 @@ redis:
9196
volumes:
9297
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
9398
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
99+
- ${HOST_LICENSE_FOLDER}:c:\license
94100
environment:
95101
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
102+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
96103
entrypoint: powershell -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
97104

98105
prc:
@@ -102,6 +109,10 @@ redis:
102109
args:
103110
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-prc:${SITECORE_VERSION}
104111
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
112+
volumes:
113+
- ${HOST_LICENSE_FOLDER}:c:\license
114+
environment:
115+
SITECORE_LICENSE_LOCATION: c:\license\license.xml
105116
depends_on:
106117
- solution
107118

@@ -112,6 +123,10 @@ redis:
112123
args:
113124
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-xdbcollection:${SITECORE_VERSION}
114125
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
126+
volumes:
127+
- ${HOST_LICENSE_FOLDER}:c:\license
128+
environment:
129+
SITECORE_LICENSE_LOCATION: c:\license\
115130
depends_on:
116131
- solution
117132

@@ -122,6 +137,10 @@ redis:
122137
args:
123138
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-xdbsearch:${SITECORE_VERSION}
124139
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
140+
volumes:
141+
- ${HOST_LICENSE_FOLDER}:c:\license
142+
environment:
143+
SITECORE_LICENSE_LOCATION: c:\license\
125144
depends_on:
126145
- solution
127146

@@ -132,6 +151,10 @@ redis:
132151
args:
133152
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-xdbautomation:${SITECORE_VERSION}
134153
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
154+
volumes:
155+
- ${HOST_LICENSE_FOLDER}:c:\license
156+
environment:
157+
SITECORE_LICENSE_LOCATION: c:\license\
135158
depends_on:
136159
- solution
137160

@@ -141,27 +164,43 @@ redis:
141164
context: ./docker/build/xdbautomationrpt
142165
args:
143166
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-xdbautomationrpt:${SITECORE_VERSION}
167+
volumes:
168+
- ${HOST_LICENSE_FOLDER}:c:\license
169+
environment:
170+
SITECORE_LICENSE_LOCATION: c:\license\
144171

145172
cortexprocessing:
146173
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-cortexprocessing:${VERSION:-latest}
147174
build:
148175
context: ./docker/build/cortexprocessing
149176
args:
150177
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-cortexprocessing:${SITECORE_VERSION}
178+
volumes:
179+
- ${HOST_LICENSE_FOLDER}:c:\license
180+
environment:
181+
SITECORE_LICENSE_LOCATION: c:\license\
151182

152183
cortexreporting:
153184
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-cortexreporting:${VERSION:-latest}
154185
build:
155186
context: ./docker/build/cortexreporting
156187
args:
157188
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-cortexreporting:${SITECORE_VERSION}
189+
volumes:
190+
- ${HOST_LICENSE_FOLDER}:c:\license
191+
environment:
192+
SITECORE_LICENSE_LOCATION: c:\license\
158193

159194
xdbrefdata:
160195
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-xdbrefdata:${VERSION:-latest}
161196
build:
162197
context: ./docker/build/xdbrefdata
163198
args:
164199
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-xdbrefdata:${SITECORE_VERSION}
200+
volumes:
201+
- ${HOST_LICENSE_FOLDER}:c:\license
202+
environment:
203+
SITECORE_LICENSE_LOCATION: c:\license\
165204

166205
xdbsearchworker:
167206
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-xdbsearchworker:${VERSION:-latest}
@@ -170,6 +209,10 @@ redis:
170209
args:
171210
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-xdbsearchworker:${SITECORE_VERSION}
172211
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
212+
volumes:
213+
- ${HOST_LICENSE_FOLDER}:c:\license
214+
environment:
215+
SITECORE_LICENSE_LOCATION: c:\license\
173216
depends_on:
174217
- solution
175218

@@ -180,6 +223,10 @@ redis:
180223
args:
181224
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-xdbautomationworker:${SITECORE_VERSION}
182225
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
226+
volumes:
227+
- ${HOST_LICENSE_FOLDER}:c:\license
228+
environment:
229+
SITECORE_LICENSE_LOCATION: c:\license\
183230
depends_on:
184231
- solution
185232

@@ -190,5 +237,9 @@ redis:
190237
args:
191238
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-cortexprocessingworker:${SITECORE_VERSION}
192239
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
240+
volumes:
241+
- ${HOST_LICENSE_FOLDER}:c:\license
242+
environment:
243+
SITECORE_LICENSE_LOCATION: c:\license\
193244
depends_on:
194245
- solution

‎custom-images/init.ps1‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ if (-not (Test-Path $LicenseXmlPath -PathType Leaf)) {
2828
throw "$LicenseXmlPath is not a file"
2929
}
3030

31+
# We actually want the folder that it's in for mounting
32+
$LicenseXmlFolderPath = (Get-Item $LicenseXmlPath).Directory.FullName
33+
34+
3135
# Check for Sitecore Gallery
3236
Import-Module PowerShellGet
3337
$SitecoreGallery = Get-PSRepository | Where-Object { $_.SourceLocation -eq "https://nuget.sitecore.com/resources/v2/" }
@@ -53,6 +57,9 @@ Write-SitecoreDockerWelcome
5357

5458
Write-Host "Populating required .env file variables..." -ForegroundColor Green
5559

60+
# HOST_LICENSE_FOLDER
61+
Set-EnvFileVariable "HOST_LICENSE_FOLDER" -Value $LicenseXmlFolderPath
62+
5663
# SITECORE_ADMIN_PASSWORD
5764
Set-EnvFileVariable "SITECORE_ADMIN_PASSWORD" -Value $SitecoreAdminPassword
5865

@@ -68,9 +75,6 @@ Set-EnvFileVariable "CM_HOST" -Value "cm.$($HostName).localhost"
6875
# ID_HOST
6976
Set-EnvFileVariable "ID_HOST" -Value "id.$($HostName).localhost"
7077

71-
# HRZ_HOST
72-
Set-EnvFileVariable "HRZ_HOST" -Value "hrz.$($HostName).localhost"
73-
7478
# REPORTING_API_KEY = random 64-128 chars
7579
Set-EnvFileVariable "REPORTING_API_KEY" -Value (Get-SitecoreRandomString 64 -DisallowSpecial)
7680

@@ -90,9 +94,6 @@ Set-EnvFileVariable "SITECORE_ID_CERTIFICATE" -Value (Get-SitecoreCertificateAsB
9094
# SITECORE_ID_CERTIFICATE_PASSWORD
9195
Set-EnvFileVariable "SITECORE_ID_CERTIFICATE_PASSWORD" -Value $idCertPassword
9296

93-
# SITECORE_LICENSE
94-
Set-EnvFileVariable "SITECORE_LICENSE" -Value (ConvertTo-CompressedBase64String -Path $LicenseXmlPath)
95-
9697
##################################
9798
# Configure TLS/HTTPS certificates
9899
##################################
@@ -131,6 +132,5 @@ Write-Host "Adding Windows hosts file entries..." -ForegroundColor Green
131132
Add-HostsEntry "cd.$($HostName).localhost"
132133
Add-HostsEntry "cm.$($HostName).localhost"
133134
Add-HostsEntry "id.$($HostName).localhost"
134-
Add-HostsEntry "hrz.$($HostName).localhost"
135135

136136
Write-Host "Done!" -ForegroundColor Green

0 commit comments

Comments
 (0)