Skip to content

Commit e4b58ab

Browse files
sc-fotisniarchossc-fotisniarchos
authored
Merge pull request #162 from Sitecore/sxp/10.4.1.012149.2344
Update 10.4 SXP Sitecore Container Deployment to 10.4.1.012149.2344
2 parents 72ba649 + 588da4a commit e4b58ab

File tree

78 files changed

+709
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+709
-167
lines changed

‎compose/sxp/10.4/ltsc2019/upgrade/xm1/compose-init.ps1‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,16 @@ Param (
5050

5151
[string]
5252
$CertDataFolder = ".\traefik\certs",
53-
53+
54+
[string]
55+
$IdFolder = ".\id",
56+
57+
[string]
58+
$SqlServerFolder = ".\mssql",
59+
60+
[string]
61+
$SqlServerCertificatePassword = "Password12345",
62+
5463
[string]
5564
$SpecificVersion
5665
)
@@ -116,7 +125,11 @@ function Create-Certificates{
116125
[string]$Topology,
117126
[string]$CdHost,
118127
[string]$CmHost,
119-
[string]$IdHost
128+
[string]$IdHost,
129+
[string]$IdFolder,
130+
[string]$MsSql,
131+
[string]$MsSqlFolder,
132+
[string]$MsSqlCertPswd
120133
)
121134

122135
Write-Information -MessageData "Starting create certificates for '$Topology' topology..." -InformationAction Continue
@@ -136,7 +149,18 @@ function Create-Certificates{
136149
$rootKey = Create-RSAKey -KeyLength 4096
137150
$rootCertificate = Create-SelfSignedCertificate -Key $rootKey
138151
Create-CertificateFile -Certificate $rootCertificate -OutCertPath "$CertDataFolder\RootCA.crt"
139-
152+
153+
# Copy RootCA.crt into id\cert
154+
Copy-Item "$CertDataFolder\RootCA.crt" -Destination "$IdFolder\certs"
155+
156+
$securePswd = (ConvertTo-SecureString -String $MsSqlCertPswd -Force -AsPlainText)
157+
$signerCertificate = Import-CertificateForSigning -SignerCertificate $rootCertificate -SignerCertificatePassword $securePswd
158+
159+
# Create Sql Server Certificate and Key as PFX file
160+
$msSqlCertPath = [System.IO.Path]::Combine((Get-Location), "$MsSqlFolder\certs\$MsSql.pfx")
161+
$mssqlCertificate = Create-SqlServerCertificate -CommonName $MsSql -DnsName $MsSql -SignerCertificate $signerCertificate
162+
Create-PfxFile -Certificate $mssqlCertificate -OutCertPath $msSqlCertPath -Password $securePswd
163+
140164
# Create Certificate and Key files for each Sitecore role
141165
$dnsNames | ForEach-Object {
142166
$selfSignedKey = Create-RSAKey
@@ -246,6 +270,7 @@ function Invoke-ComposeInit {
246270
"SQL_SERVER" = $SqlServer
247271
"SQL_USERNAME" = $SqlUserName
248272
"SQL_PASSWORD" = $SqlSaPassword
273+
"SQL_TLS_CERTIFICATE_PASSWORD" = $SqlServerCertificatePassword
249274
"IS_ALWAYS_ENCRYPTED" = $IsAlwaysEncrypted
250275
"PROCESSING_ENGINE_TASKS_DATABASE_USERNAME" = $ProcessingEngineTasksDatabaseUserName
251276
"CD_HOST" = $CdHost
@@ -269,7 +294,7 @@ function Invoke-ComposeInit {
269294
Populate-EnvironmentFile -EnvFilePath $EnvFilePath -EnvVariablesTable $envVariablesTable
270295

271296
# Configure TLS/HTTPS certificates
272-
$RootCertificateCreated = Create-Certificates -CertDataFolder $CertDataFolder -Topology $Topology -CdHost $CdHost -CmHost $CmHost -IdHost $IdHost
297+
$RootCertificateCreated = Create-Certificates -CertDataFolder $CertDataFolder -Topology $Topology -CdHost $CdHost -CmHost $CmHost -IdHost $IdHost -IdFolder $IdFolder -MsSql $SqlServer -MsSqlFolder $SqlServerFolder -MsSqlCertPswd $SqlServerCertificatePassword
273298

274299
# The update for the certs_config.yaml file is if Certificates were created for the custom hostnames.
275300
if ($RootCertificateCreated){

‎compose/sxp/10.4/ltsc2019/upgrade/xm1/upgrade.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ SQL_SERVER=
66
SQL_USERNAME=
77
SQL_PASSWORD=
88
DATABASE_UPGRADE_FROM_VERSION=10.3.0
9-
DATABASE_UPGRADE_TO_VERSION=10.4.0
9+
DATABASE_UPGRADE_TO_VERSION=10.4.1
1010
SITECORE_LICENSE=
1111
ISOLATION=default

‎compose/sxp/10.4/ltsc2019/upgrade/xp1/compose-init.ps1‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,16 @@ Param (
5050

5151
[string]
5252
$CertDataFolder = ".\traefik\certs",
53-
53+
54+
[string]
55+
$IdFolder = ".\id",
56+
57+
[string]
58+
$SqlServerFolder = ".\mssql",
59+
60+
[string]
61+
$SqlServerCertificatePassword = "Password12345",
62+
5463
[string]
5564
$SpecificVersion
5665
)
@@ -116,7 +125,11 @@ function Create-Certificates{
116125
[string]$Topology,
117126
[string]$CdHost,
118127
[string]$CmHost,
119-
[string]$IdHost
128+
[string]$IdHost,
129+
[string]$IdFolder,
130+
[string]$MsSql,
131+
[string]$MsSqlFolder,
132+
[string]$MsSqlCertPswd
120133
)
121134

122135
Write-Information -MessageData "Starting create certificates for '$Topology' topology..." -InformationAction Continue
@@ -136,7 +149,18 @@ function Create-Certificates{
136149
$rootKey = Create-RSAKey -KeyLength 4096
137150
$rootCertificate = Create-SelfSignedCertificate -Key $rootKey
138151
Create-CertificateFile -Certificate $rootCertificate -OutCertPath "$CertDataFolder\RootCA.crt"
139-
152+
153+
# Copy RootCA.crt into id\cert
154+
Copy-Item "$CertDataFolder\RootCA.crt" -Destination "$IdFolder\certs"
155+
156+
$securePswd = (ConvertTo-SecureString -String $MsSqlCertPswd -Force -AsPlainText)
157+
$signerCertificate = Import-CertificateForSigning -SignerCertificate $rootCertificate -SignerCertificatePassword $securePswd
158+
159+
# Create Sql Server Certificate and Key as PFX file
160+
$msSqlCertPath = [System.IO.Path]::Combine((Get-Location), "$MsSqlFolder\certs\$MsSql.pfx")
161+
$mssqlCertificate = Create-SqlServerCertificate -CommonName $MsSql -DnsName $MsSql -SignerCertificate $signerCertificate
162+
Create-PfxFile -Certificate $mssqlCertificate -OutCertPath $msSqlCertPath -Password $securePswd
163+
140164
# Create Certificate and Key files for each Sitecore role
141165
$dnsNames | ForEach-Object {
142166
$selfSignedKey = Create-RSAKey
@@ -246,6 +270,7 @@ function Invoke-ComposeInit {
246270
"SQL_SERVER" = $SqlServer
247271
"SQL_USERNAME" = $SqlUserName
248272
"SQL_PASSWORD" = $SqlSaPassword
273+
"SQL_TLS_CERTIFICATE_PASSWORD" = $SqlServerCertificatePassword
249274
"IS_ALWAYS_ENCRYPTED" = $IsAlwaysEncrypted
250275
"PROCESSING_ENGINE_TASKS_DATABASE_USERNAME" = $ProcessingEngineTasksDatabaseUserName
251276
"CD_HOST" = $CdHost
@@ -269,7 +294,7 @@ function Invoke-ComposeInit {
269294
Populate-EnvironmentFile -EnvFilePath $EnvFilePath -EnvVariablesTable $envVariablesTable
270295

271296
# Configure TLS/HTTPS certificates
272-
$RootCertificateCreated = Create-Certificates -CertDataFolder $CertDataFolder -Topology $Topology -CdHost $CdHost -CmHost $CmHost -IdHost $IdHost
297+
$RootCertificateCreated = Create-Certificates -CertDataFolder $CertDataFolder -Topology $Topology -CdHost $CdHost -CmHost $CmHost -IdHost $IdHost -IdFolder $IdFolder -MsSql $SqlServer -MsSqlFolder $SqlServerFolder -MsSqlCertPswd $SqlServerCertificatePassword
273298

274299
# The update for the certs_config.yaml file is if Certificates were created for the custom hostnames.
275300
if ($RootCertificateCreated){

‎compose/sxp/10.4/ltsc2019/upgrade/xp1/upgrade.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ SQL_PASSWORD=
88
IS_ALWAYS_ENCRYPTED=
99
PROCESSING_ENGINE_TASKS_DATABASE_USERNAME=
1010
DATABASE_UPGRADE_FROM_VERSION=10.3.0
11-
DATABASE_UPGRADE_TO_VERSION=10.4.0
11+
DATABASE_UPGRADE_TO_VERSION=10.4.1
1212
SITECORE_LICENSE=
1313
ISOLATION=default

‎compose/sxp/10.4/ltsc2019/xm1/.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
COMPOSE_PROJECT_NAME=sitecore-xm1
22
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
33
SITECORE_VERSION=10.4-ltsc2019
4+
SITECORE_ID_VERSION=8.0-ltsc2019
45
EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2019
56
SITECORE_ADMIN_PASSWORD=
67
SQL_SERVER=mssql
78
SQL_SA_LOGIN=sa
89
SQL_SA_PASSWORD=
910
SQL_DATABASE_PREFIX=Sitecore
1011
SQL_CUSTOM_DATABASE_PREFIX_UPDATE_FROM=
12+
SQL_TLS_CERTIFICATE_PASSWORD=
1113
TELERIK_ENCRYPTION_KEY=
1214
SITECORE_GRAPHQL_ENABLED=true
1315
SITECORE_GRAPHQL_EXPOSEPLAYGROUND=false

‎compose/sxp/10.4/ltsc2019/xm1/compose-init.ps1‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,16 @@ Param (
5050

5151
[string]
5252
$CertDataFolder = ".\traefik\certs",
53-
53+
54+
[string]
55+
$IdFolder = ".\id",
56+
57+
[string]
58+
$SqlServerFolder = ".\mssql",
59+
60+
[string]
61+
$SqlServerCertificatePassword = "Password12345",
62+
5463
[string]
5564
$SpecificVersion
5665
)
@@ -116,7 +125,11 @@ function Create-Certificates{
116125
[string]$Topology,
117126
[string]$CdHost,
118127
[string]$CmHost,
119-
[string]$IdHost
128+
[string]$IdHost,
129+
[string]$IdFolder,
130+
[string]$MsSql,
131+
[string]$MsSqlFolder,
132+
[string]$MsSqlCertPswd
120133
)
121134

122135
Write-Information -MessageData "Starting create certificates for '$Topology' topology..." -InformationAction Continue
@@ -136,7 +149,18 @@ function Create-Certificates{
136149
$rootKey = Create-RSAKey -KeyLength 4096
137150
$rootCertificate = Create-SelfSignedCertificate -Key $rootKey
138151
Create-CertificateFile -Certificate $rootCertificate -OutCertPath "$CertDataFolder\RootCA.crt"
139-
152+
153+
# Copy RootCA.crt into id\cert
154+
Copy-Item "$CertDataFolder\RootCA.crt" -Destination "$IdFolder\certs"
155+
156+
$securePswd = (ConvertTo-SecureString -String $MsSqlCertPswd -Force -AsPlainText)
157+
$signerCertificate = Import-CertificateForSigning -SignerCertificate $rootCertificate -SignerCertificatePassword $securePswd
158+
159+
# Create Sql Server Certificate and Key as PFX file
160+
$msSqlCertPath = [System.IO.Path]::Combine((Get-Location), "$MsSqlFolder\certs\$MsSql.pfx")
161+
$mssqlCertificate = Create-SqlServerCertificate -CommonName $MsSql -DnsName $MsSql -SignerCertificate $signerCertificate
162+
Create-PfxFile -Certificate $mssqlCertificate -OutCertPath $msSqlCertPath -Password $securePswd
163+
140164
# Create Certificate and Key files for each Sitecore role
141165
$dnsNames | ForEach-Object {
142166
$selfSignedKey = Create-RSAKey
@@ -246,6 +270,7 @@ function Invoke-ComposeInit {
246270
"SQL_SERVER" = $SqlServer
247271
"SQL_USERNAME" = $SqlUserName
248272
"SQL_PASSWORD" = $SqlSaPassword
273+
"SQL_TLS_CERTIFICATE_PASSWORD" = $SqlServerCertificatePassword
249274
"IS_ALWAYS_ENCRYPTED" = $IsAlwaysEncrypted
250275
"PROCESSING_ENGINE_TASKS_DATABASE_USERNAME" = $ProcessingEngineTasksDatabaseUserName
251276
"CD_HOST" = $CdHost
@@ -269,7 +294,7 @@ function Invoke-ComposeInit {
269294
Populate-EnvironmentFile -EnvFilePath $EnvFilePath -EnvVariablesTable $envVariablesTable
270295

271296
# Configure TLS/HTTPS certificates
272-
$RootCertificateCreated = Create-Certificates -CertDataFolder $CertDataFolder -Topology $Topology -CdHost $CdHost -CmHost $CmHost -IdHost $IdHost
297+
$RootCertificateCreated = Create-Certificates -CertDataFolder $CertDataFolder -Topology $Topology -CdHost $CdHost -CmHost $CmHost -IdHost $IdHost -IdFolder $IdFolder -MsSql $SqlServer -MsSqlFolder $SqlServerFolder -MsSqlCertPswd $SqlServerCertificatePassword
273298

274299
# The update for the certs_config.yaml file is if Certificates were created for the custom hostnames.
275300
if ($RootCertificateCreated){

‎compose/sxp/10.4/ltsc2019/xm1/docker-compose.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,19 @@ services:
3434
isolation: ${ISOLATION}
3535
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX}
3636
environment:
37+
NAME: ${SQL_SERVER}
3738
SA_PASSWORD: ${SQL_SA_PASSWORD}
39+
TLS_CERTIFICATE_PASSWORD: ${SQL_TLS_CERTIFICATE_PASSWORD}
3840
ACCEPT_EULA: "Y"
3941
ports:
4042
- "14330:1433"
4143
volumes:
4244
- type: bind
4345
source: .\mssql-data
4446
target: c:\data
47+
- type: bind
48+
source: .\mssql\certs
49+
target: c:\certs
4550
mssql-init:
4651
isolation: ${ISOLATION}
4752
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-mssql-init:${SITECORE_VERSION}
@@ -62,7 +67,7 @@ services:
6267
condition: service_healthy
6368
solr:
6469
isolation: ${ISOLATION}
65-
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.11.2-${EXTERNAL_IMAGE_TAG_SUFFIX}
70+
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:9.8.1-${EXTERNAL_IMAGE_TAG_SUFFIX}
6671
ports:
6772
- "8984:8983"
6873
volumes:
@@ -72,7 +77,7 @@ services:
7277
environment:
7378
SOLR_MODE: solrcloud
7479
healthcheck:
75-
test: ["CMD", "powershell", "-command", "try { $$statusCode = (iwr http://solr:8983/solr/admin/cores?action=STATUS -UseBasicParsing).StatusCode; if ($$statusCode -eq 200) { exit 0 } else { exit 1} } catch { exit 1 }"]
80+
test: ["CMD", "powershell", "-command", "try { $$statusCode = (iwr http://solr:8983/solr/admin/collections?action=LIST -UseBasicParsing).StatusCode; if ($$statusCode -eq 200) { exit 0 } else { exit 1} } catch { exit 1 }"]
7681
solr-init:
7782
isolation: ${ISOLATION}
7883
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr-init:${SITECORE_VERSION}
@@ -84,9 +89,9 @@ services:
8489
condition: service_healthy
8590
id:
8691
isolation: ${ISOLATION}
87-
image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
92+
image: ${SITECORE_DOCKER_REGISTRY}sitecore-identity:${SITECORE_ID_VERSION}
8893
environment:
89-
Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
94+
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=false;
9095
Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
9196
Sitecore_Sitecore__IdentityServer__Clients__PasswordClient__ClientSecrets__ClientSecret1: ${SITECORE_IDSECRET}
9297
Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1: https://${CM_HOST}
@@ -105,6 +110,10 @@ services:
105110
- "traefik.http.routers.id-secure.entrypoints=websecure"
106111
- "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)"
107112
- "traefik.http.routers.id-secure.tls=true"
113+
volumes:
114+
- type: bind
115+
source: .\id\certs
116+
target: c:\certs
108117
cd:
109118
isolation: ${ISOLATION}
110119
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION}

‎compose/sxp/10.4/ltsc2019/xm1/id/certs/readme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Add a CA certificate to the trusted root store:
2+
RootCA.crt

‎compose/sxp/10.4/ltsc2019/xm1/mssql/certs/readme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Add TLS certificates for the mssql service to this folder:
2+
mssql.pfx

‎compose/sxp/10.4/ltsc2019/xp0/.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
COMPOSE_PROJECT_NAME=sitecore-xp0
22
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
33
SITECORE_VERSION=10.4-ltsc2019
4+
SITECORE_ID_VERSION=8.0-ltsc2019
45
EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2019
56
SITECORE_ADMIN_PASSWORD=
67
SQL_SERVER=mssql
78
SQL_SA_LOGIN=sa
89
SQL_SA_PASSWORD=
910
SQL_DATABASE_PREFIX=Sitecore
1011
SQL_CUSTOM_DATABASE_PREFIX_UPDATE_FROM=
12+
SQL_TLS_CERTIFICATE_PASSWORD=
1113
TELERIK_ENCRYPTION_KEY=
1214
SITECORE_GRAPHQL_ENABLED=true
1315
SITECORE_GRAPHQL_EXPOSEPLAYGROUND=false

0 commit comments

Comments
 (0)