Skip to content

Commit c6c0b7e

Browse files
afaniuoloafaniuolo
authored
Merge pull request #4 from Sitecore/master
Update forked repository
2 parents 8eb6c8e + a8f8175 commit c6c0b7e

File tree

1,142 files changed

+8946
-562
lines changed

Some content is hidden

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

1,142 files changed

+8946
-562
lines changed

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,10 @@ windows/tests/**/data/**/*
1515

1616
/.vscode/
1717
/tools/
18+
19+
windows/tests/**/mssql-data/**/*
20+
windows/tests/**/solr-data/**/*
21+
22+
*.pem
23+
*.crt
24+
*.key

‎Build.ps1‎

Lines changed: 68 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ param(
1919
[Parameter()]
2020
[string]$RegistryPassword = "",
2121
[Parameter()]
22-
[ValidateSet("9.3.0", "9.2.0", "9.1.1", "9.0.2")]
23-
[string[]]$SitecoreVersion = @("9.3.0"),
24-
[ValidateSet("xm", "xp", "xc")]
25-
[string[]]$Topology = @("xm", "xp"),
22+
[ValidatePattern('[0-9]+\.[0-9]+\.[0-9]+')]
23+
[string[]]$SitecoreVersion = @("10.0.0"),
24+
[ValidateSet("xm", "xp", "xc", "xp0")]
25+
[string[]]$Topology = @("xm", "xp", "xp0"),
2626
[ValidateSet("2004", "1909", "1903", "ltsc2019", "linux")]
2727
[string[]]$OSVersion = @("ltsc2019"),
2828
[Parameter()]
@@ -40,6 +40,8 @@ param(
4040
[string]$IsolationModeBehaviour = "ForceHyperV"
4141
)
4242

43+
Push-Location build
44+
4345
function Write-Message
4446
{
4547
param(
@@ -53,14 +55,14 @@ function Write-Message
5355

5456
if ([string]::IsNullOrEmpty($InstallSourcePath))
5557
{
56-
$InstallSourcePath = (Join-Path -Path $PSScriptRoot -ChildPath "\packages")
58+
$InstallSourcePath = (Join-Path -Path $(Get-Location) -ChildPath "\packages")
5759
}
5860

5961
$ErrorActionPreference = "STOP"
6062
$ProgressPreference = "SilentlyContinue"
6163

6264
# load module
63-
Import-Module (Join-Path $PSScriptRoot "\modules\SitecoreImageBuilder") -RequiredVersion 1.0.0 -Force
65+
Import-Module (Join-Path $(Get-Location) "\modules\SitecoreImageBuilder") -RequiredVersion 1.0.0 -Force
6466

6567
$tags = [System.Collections.ArrayList]@()
6668

@@ -82,7 +84,7 @@ filter LinuxFilter
8284
filter WindowsFilter
8385
{
8486
param([string]$Version)
85-
if ($_ -like "*-windowsservercore-$($Version)" -or $_ -like "*-nanoserver-$($windowsVersionMapping[$Version])")
87+
if ($_ -match ".*((-windowsservercore){0,1})-$($Version)" -or $_ -match ".*((-nanoserver){0,1})-$($windowsVersionMapping[$Version])")
8688
{
8789
$_
8890
}
@@ -91,7 +93,7 @@ filter WindowsFilter
9193
filter SitecoreFilter
9294
{
9395
param([string]$Version)
94-
if ($_ -like "*:$($Version)-windowsservercore-*" -or $_ -like "*:$($Version)-nanoserver-*" -or $_ -like "*:$($Version)-linux")
96+
if ($_ -match ".*:$($Version)((-windowsservercore){0,1})-*" -or $_ -match ".*:$($Version)((-nanoserver){0,1})-*" -or $_ -like "*:$($Version)-linux")
9597
{
9698
$_
9799
}
@@ -103,7 +105,7 @@ if ($OSVersion -eq "linux")
103105
$rootFolder = "linux"
104106
}
105107

106-
$availableSpecs = Get-BuildSpecifications -Path (Join-Path $PSScriptRoot $rootFolder)
108+
$availableSpecs = Get-BuildSpecifications -Path (Join-Path $(Get-Location) $rootFolder)
107109

108110
if (!$IncludeExperimental)
109111
{
@@ -116,23 +118,29 @@ $defaultTags = $availableTags | Where-Object { $_ -like "mssql-developer:*" -or
116118
$xpMiscTags = $availableTags | Where-Object { $_ -like "sitecore-certificates:*" }
117119
$xcMiscTags = $availableTags | Where-Object { $_ -like "sitecore-certificates:*" -or $_ -like "sitecore-redis:*" }
118120

119-
$assetTags = $availableTags | Where-Object { $_ -like "sitecore-assets:*" }
120-
$xmTags = $availableTags | Where-Object { $_ -match "sitecore-xm-(?!sxa|spe|jss).*:.*" }
121-
$xpTags = $availableTags | Where-Object { $_ -match "sitecore-xp-(?!sxa|spe|jss).*:.*" }
122-
$xcTags = $availableTags | Where-Object { $_ -match "sitecore-xc-(?!sxa|spe|jss).*:.*" }
121+
$assetTags = $availableTags | Where-Object { $_ -match "sitecore(-custom)?-assets:.*" }
122+
$moduleAssetTags = $availableTags | Where-Object { $_ -like "modules/*" }
123+
$xmTags = $availableTags | Where-Object { $_ -match "sitecore-xm(-custom)?-(?!.*spe|.*sxa|.*jss).*:.*" }
124+
$xpTags = $availableTags | Where-Object { $_ -match "sitecore-xp(-custom)?-(?!.*spe|.*sxa|.*jss).*:.*" }
125+
126+
$xcTags = $availableTags | Where-Object { $_ -match "sitecore-xc(-custom)?-(?!.*spe|.*sxa|.*jss).*:.*" }
127+
128+
$xmSpeTags = $availableTags | Where-Object { $_ -match "sitecore-xm(-custom)?-(spe)(?!.*sxa).*:.*" }
129+
$xmSxaTags = $availableTags | Where-Object { $_ -match "sitecore-xm(-custom)?-(.*sxa)(?!.*jss).*:.*" }
130+
$xmJssTags = $availableTags | Where-Object { $_ -match "sitecore-xm(-custom)?-(.*jss).*:.*" }
123131

124-
$xmSpeTags = $availableTags | Where-Object { $_ -match "sitecore-xm-(spe).*:.*" }
125-
$xmSxaTags = $availableTags | Where-Object { $_ -match "sitecore-xm-(sxa).*:.*" }
126-
$xmJssTags = $availableTags | Where-Object { $_ -match "sitecore-xm-(jss).*:.*" }
132+
$xp0SpeTags = $availableTags | Where-Object { $_ -match "sitecore-xp0(-custom)?-(spe)(?!.*sxa).*:.*" }
133+
$xp0SxaTags = $availableTags | Where-Object { $_ -match "sitecore-xp0(-custom)?-(.*sxa)(?!.*jss).*:.*" }
134+
$xp0JssTags = $availableTags | Where-Object { $_ -match "sitecore-xp0(-custom)?-(.*jss).*:.*" }
127135

128-
$xpSpeTags = $availableTags | Where-Object { $_ -match "sitecore-xp-(spe).*:.*" }
129-
$xpSxaTags = $availableTags | Where-Object { $_ -match "sitecore-xp-(sxa).*:.*" }
130-
$xpJssTags = $availableTags | Where-Object { $_ -match "sitecore-xp-(jss).*:.*" }
136+
$xpSpeTags = $availableTags | Where-Object { $_ -match "sitecore-xp([1]{0,1})(-custom)?-(spe)(?!.*sxa).*:.*" }
137+
$xpSxaTags = $availableTags | Where-Object { $_ -match "sitecore-xp([1]{0,1})(-custom)?-(.*sxa)(?!.*jss).*:.*" }
138+
$xpJssTags = $availableTags | Where-Object { $_ -match "sitecore-xp([1]{0,1})(-custom)?-(.*jss).*:.*" }
131139

132140
$xcSpeTags = $availableTags | Where-Object { $_ -match "sitecore-xc-(spe).*:.*" }
133141
$xcSxaTags = $availableTags | Where-Object { $_ -match "sitecore-xc-(sxa).*:.*" }
134142

135-
$knownTags = $defaultTags + $xpMiscTags + $xcMiscTags + $assetTags + $xmTags + $xpTags + $xcTags + $xmSpeTags + $xpSpeTags + $xcSpeTags + $xmSxaTags + $xpSxaTags + $xcSxaTags + $xmJssTags + $xpJssTags
143+
$knownTags = $defaultTags + $xpMiscTags + $xcMiscTags + $assetTags + $moduleAssetTags + $xmTags + $xpTags + $xcTags + $xmSpeTags + $xp0SpeTags + $xpSpeTags + $xcSpeTags + $xmSxaTags + $xp0SxaTags + $xpSxaTags + $xcSxaTags + $xmJssTags + $xp0JssTags + $xpJssTags
136144
# These tags are not yet classified and no dependency check is made at this point to know which image it belongs to.
137145
$catchAllTags = [System.Linq.Enumerable]::Except([string[]]$availableTags, [string[]]$knownTags)
138146

@@ -145,17 +153,18 @@ foreach ($wv in $OSVersion)
145153
$xpMiscTags | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
146154
}
147155

148-
if ($Topology -contains "xc")
156+
if ($Topology -eq "xc")
149157
{
150158
$xcMiscTags | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
151159
}
152160

153161
foreach ($scv in $SitecoreVersion)
154162
{
155163
$assetTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
164+
$moduleAssetTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
156165
$catchAllTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
157166

158-
if ($Topology -contains "xm")
167+
if ($Topology -eq "xm")
159168
{
160169
$xmTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
161170

@@ -165,7 +174,7 @@ foreach ($wv in $OSVersion)
165174
}
166175
}
167176

168-
if ($Topology -contains "xp")
177+
if ($Topology -eq "xp")
169178
{
170179
$xpTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
171180

@@ -175,19 +184,28 @@ foreach ($wv in $OSVersion)
175184
}
176185
}
177186

178-
if ($Topology -contains "xc")
187+
if ($Topology -eq "xc")
179188
{
180189
$xcTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
181190
}
182191

183192
if ($IncludeSpe)
184193
{
185-
if ($Topology -contains "xm")
194+
if ($Topology -eq "xm")
186195
{
187196
$xmSpeTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
188197
}
189198

190-
if ($Topology -contains "xp")
199+
if ($Topology -eq "xp0")
200+
{
201+
$xp0SpeTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
202+
203+
if ($wv -eq "linux")
204+
{
205+
$xp0SpeTags | SitecoreFilter -Version $scv | LinuxFilter | ForEach-Object { $tags.Add($_) > $null }
206+
}
207+
}
208+
if ($Topology -eq "xp")
191209
{
192210
$xpSpeTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
193211

@@ -197,20 +215,28 @@ foreach ($wv in $OSVersion)
197215
}
198216
}
199217

200-
if ($Topology -contains "xc")
218+
if ($Topology -eq "xc")
201219
{
202220
$xcSpeTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
203221
}
204222
}
205223

206224
if ($IncludeSxa)
207225
{
208-
if ($Topology -contains "xm")
226+
if ($Topology -eq "xm")
209227
{
210228
$xmSxaTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
211229
}
230+
if ($Topology -eq "xp0")
231+
{
232+
$xp0SxaTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
212233

213-
if ($Topology -contains "xp")
234+
if ($wv -eq "linux")
235+
{
236+
$xp0SxaTags | SitecoreFilter -Version $scv | LinuxFilter | ForEach-Object { $tags.Add($_) > $null }
237+
}
238+
}
239+
if ($Topology -eq "xp")
214240
{
215241
$xpSxaTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
216242

@@ -220,20 +246,25 @@ foreach ($wv in $OSVersion)
220246
}
221247
}
222248

223-
if ($Topology -contains "xc")
249+
if ($Topology -eq "xc")
224250
{
225251
$xcSxaTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
226252
}
227253
}
228254

229255
if ($IncludeJss)
230256
{
231-
if ($Topology -contains "xm")
257+
if ($Topology -eq "xm")
232258
{
233259
$xmJssTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
234260
}
235261

236-
if ($Topology -contains "xp")
262+
if ($Topology -eq "xp0")
263+
{
264+
$xp0JssTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
265+
}
266+
267+
if ($Topology -eq "xp")
237268
{
238269
$xpJssTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
239270
}
@@ -269,7 +300,7 @@ else
269300

270301
# restore any missing packages
271302
SitecoreImageBuilder\Invoke-PackageRestore `
272-
-Path (Join-Path $PSScriptRoot $rootFolder) `
303+
-Path (Join-Path $(Get-Location) $rootFolder) `
273304
-Destination $InstallSourcePath `
274305
-SitecoreUsername $SitecoreUsername `
275306
-SitecorePassword $SitecorePassword `
@@ -279,10 +310,12 @@ SitecoreImageBuilder\Invoke-PackageRestore `
279310

280311
# start the build
281312
SitecoreImageBuilder\Invoke-Build `
282-
-Path (Join-Path $PSScriptRoot $rootFolder) `
313+
-Path (Join-Path $(Get-Location) $rootFolder) `
283314
-InstallSourcePath $InstallSourcePath `
284315
-Registry $Registry `
285316
-Tags $tags `
286317
-ExperimentalTagBehavior:(@{$true = "Include"; $false = "Skip" }[$IncludeExperimental -eq $true]) `
287318
-IsolationModeBehaviour $IsolationModeBehaviour `
288-
-WhatIf:$WhatIfPreference
319+
-WhatIf:$WhatIfPreference
320+
321+
Pop-Location

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
1. Follow the [formatting/style settings](.vscode/settings.json), run "Format Document" in Visual Studio Code (default SHIFT+ALT+F) and also look how everything else is formatted.
66
1. Remember to update README.md and/or CHANGELOG.md with relevant info.
7-
1. When adding or changing images, run `.\Update-Documentation.ps1` so IMAGES.md is updated as well as the stats in README.md.
8-
1. When you have changes to `.\sitecore-packages.json` you can:
9-
1. Run `.\contributing\Test-SitecorePackagesJson.ps1` to verify the urls are working.
10-
1. Run `.\contributing\Sort-SitecorePackagesJson.ps1` to sort the packages by name.
7+
1. When adding or changing images, run `.\build\Update-Documentation.ps1` so IMAGES.md is updated as well as the stats in README.md.
8+
1. When you have changes to `.\build\sitecore-packages.json` you can:
9+
1. Run `.\build\contributing\Test-SitecorePackagesJson.ps1` to verify the urls are working.
10+
1. Run `.\build\contributing\Sort-SitecorePackagesJson.ps1` to sort the packages by name.
1111

1212
## Submitting pull requests
1313

0 commit comments

Comments
 (0)