Skip to content

Commit 72ba649

Browse files
sc-eugeniabelinskayasc-eugeniabelinskaya
authored
Merge pull request #161 from Sitecore/sxp/10.3.2.010837.1896)
Update Sitecore Experience Platform Container Deployment to 10.3.2.010837.1896
2 parents ac0baca + 2281e89 commit 72ba649

Some content is hidden

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

46 files changed

+409
-531
lines changed

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

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Param (
4444
$IdHost = "$($Topology)id.localhost",
4545

4646
[string]
47-
$SitecoreGalleryRepositoryLocation = "https://sitecore.myget.org/F/sc-powershell/api/v2",
47+
$SitecoreGalleryRepositoryLocation = "https://nuget.sitecore.com/resources/v2/",
4848

4949
[string]
5050
$CertDataFolder = ".\traefik\certs",
@@ -185,17 +185,36 @@ function Update-CertsConfigFile{
185185
Write-Information -MessageData "certs_config.yaml file was successfully updated." -InformationAction Continue
186186
}
187187

188-
function InstallModule{
189-
param(
190-
[string]$ModuleName,
191-
[string]$ModuleVersion,
192-
[string]$RepositoryName
188+
function InstallModule {
189+
Param(
190+
[String]$ModuleName,
191+
[String]$ModuleVersion
193192
)
193+
try {
194+
$repository = Get-PSRepository | Where-Object { $_.SourceLocation -eq $SitecoreGalleryRepositoryLocation }
195+
if (!$repository) {
196+
$tempRepositoryName = "Temp" + (New-Guid)
197+
Register-PSRepository -Name $tempRepositoryName -SourceLocation $SitecoreGalleryRepositoryLocation -InstallationPolicy Trusted
198+
$repository = Get-PSRepository | Where-Object { $_.SourceLocation -eq $SitecoreGalleryRepositoryLocation }
199+
}
200+
if (!$ModuleVersion) {
201+
$ModuleVersion = (Find-Module -Name $ModuleName -Repository $repository.Name -AllowPrerelease).Version
202+
Write-Host "The Docker tool version was not specified. The latest available '$ModuleVersion' version will be used." -ForegroundColor Green
203+
}
194204

195-
$moduleInstalled = Get-InstalledModule -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -ErrorAction SilentlyContinue
196-
if (-not $moduleInstalled) {
197-
Write-Host "Installing '$ModuleName'" -ForegroundColor Green
198-
Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -Repository $RepositoryName -Scope CurrentUser
205+
$moduleInstalled = Get-InstalledModule -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -ErrorAction SilentlyContinue
206+
if (!$moduleInstalled) {
207+
Write-Host "Installing '$ModuleName' $ModuleVersion" -ForegroundColor Green
208+
Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion -Repository $repository.Name -AllowClobber -AllowPrerelease -Scope CurrentUser -Force -ErrorAction "Stop"
209+
}
210+
$localModulePath = ((Get-Module $ModuleName -ListAvailable) | Where-Object Version -eq $ModuleVersion.Split("-")[0]).Path
211+
Write-Host "Importing '$moduleName' '$ModuleVersion' from '$localModulePath' ..."
212+
Import-Module -Name $localModulePath
213+
}
214+
finally {
215+
if ($tempRepositoryName -and ($repository.Name -eq $tempRepositoryName)) {
216+
Unregister-PSRepository -Name $tempRepositoryName
217+
}
199218
}
200219
}
201220

@@ -207,42 +226,9 @@ function Invoke-ComposeInit {
207226
throw "$LicenseXmlPath is not a file"
208227
}
209228

210-
# Check for Sitecore Gallery
211-
Import-Module PowerShellGet
212-
$SitecoreGalleryName = 'SitecoreGallery'
213-
$SitecoreGallery = Get-PSRepository | Where-Object { $_.Name -eq $SitecoreGalleryName }
214-
if (-not $SitecoreGallery) {
215-
Write-Host "Adding Sitecore PowerShell Gallery..." -ForegroundColor Green
216-
Register-PSRepository -Name $SitecoreGalleryName -SourceLocation $SitecoreGalleryRepositoryLocation -InstallationPolicy Trusted
217-
$SitecoreGallery = Get-PSRepository -Name $SitecoreGalleryName
218-
}
219-
220229
# Install and Import SitecoreDockerTools
221-
$moduleName = "SitecoreDockerTools"
222-
$repositoryName = $SitecoreGallery.Name
223-
224-
$module = Find-Module -Name $moduleName -Repository $repositoryName
225-
$latestVersion = $module.Version
226-
$importModuleCommand = "Import-Module $moduleName -RequiredVersion $latestVersion"
227-
228-
if(![string]::IsNullOrEmpty($SpecificVersion)){
229-
$module = Find-Module -Name $moduleName -Repository $repositoryName -RequiredVersion $SpecificVersion -AllowPrerelease
230-
$latestVersion = $module.Version
231-
232-
if([string]::IsNullOrEmpty($latestVersion)){
233-
Write-Warning -Message "'$moduleName' module with '$SpecificVersion' version doesn't exist."
234-
return
235-
}
236-
InstallModule -ModuleName $moduleName -ModuleVersion $latestVersion -RepositoryName $repositoryName
237-
238-
$modulePath = ((Get-Module $moduleName -ListAvailable) | where Version -eq $latestVersion.Split("-")[0]).Path
239-
$importModuleCommand = "Import-Module -Name $modulePath"
240-
}else{
241-
InstallModule -ModuleName $moduleName -ModuleVersion $latestVersion -RepositoryName $repositoryName
242-
}
243-
244-
Write-Host "Importing '$moduleName'..." -ForegroundColor Green
245-
Invoke-Expression $importModuleCommand
230+
$ModuleName = "SitecoreDockerTools"
231+
InstallModule -ModuleName $ModuleName -ModuleVersion $SpecificVersion
246232

247233
$idCertPassword = Get-SitecoreRandomString 12 -DisallowSpecial
248234
$envVariablesTable = @{

‎compose/sxp/10.3/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.2.0
9-
DATABASE_UPGRADE_TO_VERSION=10.3.1
9+
DATABASE_UPGRADE_TO_VERSION=10.3.2
1010
SITECORE_LICENSE=
1111
ISOLATION=default

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

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Param (
4444
$IdHost = "$($Topology)id.localhost",
4545

4646
[string]
47-
$SitecoreGalleryRepositoryLocation = "https://sitecore.myget.org/F/sc-powershell/api/v2",
47+
$SitecoreGalleryRepositoryLocation = "https://nuget.sitecore.com/resources/v2/",
4848

4949
[string]
5050
$CertDataFolder = ".\traefik\certs",
@@ -185,17 +185,36 @@ function Update-CertsConfigFile{
185185
Write-Information -MessageData "certs_config.yaml file was successfully updated." -InformationAction Continue
186186
}
187187

188-
function InstallModule{
189-
param(
190-
[string]$ModuleName,
191-
[string]$ModuleVersion,
192-
[string]$RepositoryName
188+
function InstallModule {
189+
Param(
190+
[String]$ModuleName,
191+
[String]$ModuleVersion
193192
)
193+
try {
194+
$repository = Get-PSRepository | Where-Object { $_.SourceLocation -eq $SitecoreGalleryRepositoryLocation }
195+
if (!$repository) {
196+
$tempRepositoryName = "Temp" + (New-Guid)
197+
Register-PSRepository -Name $tempRepositoryName -SourceLocation $SitecoreGalleryRepositoryLocation -InstallationPolicy Trusted
198+
$repository = Get-PSRepository | Where-Object { $_.SourceLocation -eq $SitecoreGalleryRepositoryLocation }
199+
}
200+
if (!$ModuleVersion) {
201+
$ModuleVersion = (Find-Module -Name $ModuleName -Repository $repository.Name -AllowPrerelease).Version
202+
Write-Host "The Docker tool version was not specified. The latest available '$ModuleVersion' version will be used." -ForegroundColor Green
203+
}
194204

195-
$moduleInstalled = Get-InstalledModule -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -ErrorAction SilentlyContinue
196-
if (-not $moduleInstalled) {
197-
Write-Host "Installing '$ModuleName'" -ForegroundColor Green
198-
Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -Repository $RepositoryName -Scope CurrentUser
205+
$moduleInstalled = Get-InstalledModule -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -ErrorAction SilentlyContinue
206+
if (!$moduleInstalled) {
207+
Write-Host "Installing '$ModuleName' $ModuleVersion" -ForegroundColor Green
208+
Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion -Repository $repository.Name -AllowClobber -AllowPrerelease -Scope CurrentUser -Force -ErrorAction "Stop"
209+
}
210+
$localModulePath = ((Get-Module $ModuleName -ListAvailable) | Where-Object Version -eq $ModuleVersion.Split("-")[0]).Path
211+
Write-Host "Importing '$moduleName' '$ModuleVersion' from '$localModulePath' ..."
212+
Import-Module -Name $localModulePath
213+
}
214+
finally {
215+
if ($tempRepositoryName -and ($repository.Name -eq $tempRepositoryName)) {
216+
Unregister-PSRepository -Name $tempRepositoryName
217+
}
199218
}
200219
}
201220

@@ -207,42 +226,9 @@ function Invoke-ComposeInit {
207226
throw "$LicenseXmlPath is not a file"
208227
}
209228

210-
# Check for Sitecore Gallery
211-
Import-Module PowerShellGet
212-
$SitecoreGalleryName = 'SitecoreGallery'
213-
$SitecoreGallery = Get-PSRepository | Where-Object { $_.Name -eq $SitecoreGalleryName }
214-
if (-not $SitecoreGallery) {
215-
Write-Host "Adding Sitecore PowerShell Gallery..." -ForegroundColor Green
216-
Register-PSRepository -Name $SitecoreGalleryName -SourceLocation $SitecoreGalleryRepositoryLocation -InstallationPolicy Trusted
217-
$SitecoreGallery = Get-PSRepository -Name $SitecoreGalleryName
218-
}
219-
220229
# Install and Import SitecoreDockerTools
221-
$moduleName = "SitecoreDockerTools"
222-
$repositoryName = $SitecoreGallery.Name
223-
224-
$module = Find-Module -Name $moduleName -Repository $repositoryName
225-
$latestVersion = $module.Version
226-
$importModuleCommand = "Import-Module $moduleName -RequiredVersion $latestVersion"
227-
228-
if(![string]::IsNullOrEmpty($SpecificVersion)){
229-
$module = Find-Module -Name $moduleName -Repository $repositoryName -RequiredVersion $SpecificVersion -AllowPrerelease
230-
$latestVersion = $module.Version
231-
232-
if([string]::IsNullOrEmpty($latestVersion)){
233-
Write-Warning -Message "'$moduleName' module with '$SpecificVersion' version doesn't exist."
234-
return
235-
}
236-
InstallModule -ModuleName $moduleName -ModuleVersion $latestVersion -RepositoryName $repositoryName
237-
238-
$modulePath = ((Get-Module $moduleName -ListAvailable) | where Version -eq $latestVersion.Split("-")[0]).Path
239-
$importModuleCommand = "Import-Module -Name $modulePath"
240-
}else{
241-
InstallModule -ModuleName $moduleName -ModuleVersion $latestVersion -RepositoryName $repositoryName
242-
}
243-
244-
Write-Host "Importing '$moduleName'..." -ForegroundColor Green
245-
Invoke-Expression $importModuleCommand
230+
$ModuleName = "SitecoreDockerTools"
231+
InstallModule -ModuleName $ModuleName -ModuleVersion $SpecificVersion
246232

247233
$idCertPassword = Get-SitecoreRandomString 12 -DisallowSpecial
248234
$envVariablesTable = @{

‎compose/sxp/10.3/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.2.0
11-
DATABASE_UPGRADE_TO_VERSION=10.3.1
11+
DATABASE_UPGRADE_TO_VERSION=10.3.2
1212
SITECORE_LICENSE=
1313
ISOLATION=default

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ SITECORE_LICENSE=
2020
CD_HOST=xm1cd.localhost
2121
CM_HOST=xm1cm.localhost
2222
ID_HOST=xm1id.localhost
23-
TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
24-
TRAEFIK_ISOLATION=hyperv
23+
TRAEFIK_IMAGE=traefik:v2.11.0-windowsservercore-1809
24+
TRAEFIK_ISOLATION=default
2525
ISOLATION=default
2626
SOLR_CORE_PREFIX_NAME=sitecore
2727
# You should change the shared secret to a random string and not use the default value

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

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Param (
4444
$IdHost = "$($Topology)id.localhost",
4545

4646
[string]
47-
$SitecoreGalleryRepositoryLocation = "https://sitecore.myget.org/F/sc-powershell/api/v2",
47+
$SitecoreGalleryRepositoryLocation = "https://nuget.sitecore.com/resources/v2/",
4848

4949
[string]
5050
$CertDataFolder = ".\traefik\certs",
@@ -185,17 +185,36 @@ function Update-CertsConfigFile{
185185
Write-Information -MessageData "certs_config.yaml file was successfully updated." -InformationAction Continue
186186
}
187187

188-
function InstallModule{
189-
param(
190-
[string]$ModuleName,
191-
[string]$ModuleVersion,
192-
[string]$RepositoryName
188+
function InstallModule {
189+
Param(
190+
[String]$ModuleName,
191+
[String]$ModuleVersion
193192
)
193+
try {
194+
$repository = Get-PSRepository | Where-Object { $_.SourceLocation -eq $SitecoreGalleryRepositoryLocation }
195+
if (!$repository) {
196+
$tempRepositoryName = "Temp" + (New-Guid)
197+
Register-PSRepository -Name $tempRepositoryName -SourceLocation $SitecoreGalleryRepositoryLocation -InstallationPolicy Trusted
198+
$repository = Get-PSRepository | Where-Object { $_.SourceLocation -eq $SitecoreGalleryRepositoryLocation }
199+
}
200+
if (!$ModuleVersion) {
201+
$ModuleVersion = (Find-Module -Name $ModuleName -Repository $repository.Name -AllowPrerelease).Version
202+
Write-Host "The Docker tool version was not specified. The latest available '$ModuleVersion' version will be used." -ForegroundColor Green
203+
}
194204

195-
$moduleInstalled = Get-InstalledModule -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -ErrorAction SilentlyContinue
196-
if (-not $moduleInstalled) {
197-
Write-Host "Installing '$ModuleName'" -ForegroundColor Green
198-
Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -Repository $RepositoryName -Scope CurrentUser
205+
$moduleInstalled = Get-InstalledModule -Name $ModuleName -RequiredVersion $ModuleVersion -AllowPrerelease -ErrorAction SilentlyContinue
206+
if (!$moduleInstalled) {
207+
Write-Host "Installing '$ModuleName' $ModuleVersion" -ForegroundColor Green
208+
Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion -Repository $repository.Name -AllowClobber -AllowPrerelease -Scope CurrentUser -Force -ErrorAction "Stop"
209+
}
210+
$localModulePath = ((Get-Module $ModuleName -ListAvailable) | Where-Object Version -eq $ModuleVersion.Split("-")[0]).Path
211+
Write-Host "Importing '$moduleName' '$ModuleVersion' from '$localModulePath' ..."
212+
Import-Module -Name $localModulePath
213+
}
214+
finally {
215+
if ($tempRepositoryName -and ($repository.Name -eq $tempRepositoryName)) {
216+
Unregister-PSRepository -Name $tempRepositoryName
217+
}
199218
}
200219
}
201220

@@ -207,42 +226,9 @@ function Invoke-ComposeInit {
207226
throw "$LicenseXmlPath is not a file"
208227
}
209228

210-
# Check for Sitecore Gallery
211-
Import-Module PowerShellGet
212-
$SitecoreGalleryName = 'SitecoreGallery'
213-
$SitecoreGallery = Get-PSRepository | Where-Object { $_.Name -eq $SitecoreGalleryName }
214-
if (-not $SitecoreGallery) {
215-
Write-Host "Adding Sitecore PowerShell Gallery..." -ForegroundColor Green
216-
Register-PSRepository -Name $SitecoreGalleryName -SourceLocation $SitecoreGalleryRepositoryLocation -InstallationPolicy Trusted
217-
$SitecoreGallery = Get-PSRepository -Name $SitecoreGalleryName
218-
}
219-
220229
# Install and Import SitecoreDockerTools
221-
$moduleName = "SitecoreDockerTools"
222-
$repositoryName = $SitecoreGallery.Name
223-
224-
$module = Find-Module -Name $moduleName -Repository $repositoryName
225-
$latestVersion = $module.Version
226-
$importModuleCommand = "Import-Module $moduleName -RequiredVersion $latestVersion"
227-
228-
if(![string]::IsNullOrEmpty($SpecificVersion)){
229-
$module = Find-Module -Name $moduleName -Repository $repositoryName -RequiredVersion $SpecificVersion -AllowPrerelease
230-
$latestVersion = $module.Version
231-
232-
if([string]::IsNullOrEmpty($latestVersion)){
233-
Write-Warning -Message "'$moduleName' module with '$SpecificVersion' version doesn't exist."
234-
return
235-
}
236-
InstallModule -ModuleName $moduleName -ModuleVersion $latestVersion -RepositoryName $repositoryName
237-
238-
$modulePath = ((Get-Module $moduleName -ListAvailable) | where Version -eq $latestVersion.Split("-")[0]).Path
239-
$importModuleCommand = "Import-Module -Name $modulePath"
240-
}else{
241-
InstallModule -ModuleName $moduleName -ModuleVersion $latestVersion -RepositoryName $repositoryName
242-
}
243-
244-
Write-Host "Importing '$moduleName'..." -ForegroundColor Green
245-
Invoke-Expression $importModuleCommand
230+
$ModuleName = "SitecoreDockerTools"
231+
InstallModule -ModuleName $ModuleName -ModuleVersion $SpecificVersion
246232

247233
$idCertPassword = Get-SitecoreRandomString 12 -DisallowSpecial
248234
$envVariablesTable = @{

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

Lines changed: 2 additions & 2 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:2019-${EXTERNAL_IMAGE_TAG_SUFFIX}
3636
environment:
3737
SA_PASSWORD: ${SQL_SA_PASSWORD}
3838
ACCEPT_EULA: "Y"
@@ -72,7 +72,7 @@ services:
7272
environment:
7373
SOLR_MODE: solrcloud
7474
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 }"]
75+
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 }"]
7676
solr-init:
7777
isolation: ${ISOLATION}
7878
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr-init:${SITECORE_VERSION}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ SITECORE_ID_CERTIFICATE_PASSWORD=
1919
SITECORE_LICENSE=
2020
CM_HOST=xp0cm.localhost
2121
ID_HOST=xp0id.localhost
22-
TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
23-
TRAEFIK_ISOLATION=hyperv
22+
TRAEFIK_IMAGE=traefik:v2.11.0-windowsservercore-1809
23+
TRAEFIK_ISOLATION=default
2424
ISOLATION=default
2525
SOLR_CORE_PREFIX_NAME=sitecore
2626
# You should change the shared secret to a random string and not use the default value

0 commit comments

Comments
 (0)