Skip to content

Commit edec132

Browse files
afaniuoloafaniuolo
committed
Implemented Sitecore Universal Tracker images for SC 9.3.
1 parent c6c0b7e commit edec132

File tree

25 files changed

+770
-5
lines changed

25 files changed

+770
-5
lines changed

‎Build.ps1‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ param(
3131
[switch]$IncludeSxa,
3232
[Parameter()]
3333
[switch]$IncludeJss,
34+
[Parameter()]
35+
[switch]$IncludeUt,
3436
[Parameter(HelpMessage = "If the docker image is already built it should be skipped.")]
3537
[switch]$SkipExistingImage,
3638
[Parameter()]
@@ -121,7 +123,7 @@ $xcMiscTags = $availableTags | Where-Object { $_ -like "sitecore-certificates:*"
121123
$assetTags = $availableTags | Where-Object { $_ -match "sitecore(-custom)?-assets:.*" }
122124
$moduleAssetTags = $availableTags | Where-Object { $_ -like "modules/*" }
123125
$xmTags = $availableTags | Where-Object { $_ -match "sitecore-xm(-custom)?-(?!.*spe|.*sxa|.*jss).*:.*" }
124-
$xpTags = $availableTags | Where-Object { $_ -match "sitecore-xp(-custom)?-(?!.*spe|.*sxa|.*jss).*:.*" }
126+
$xpTags = $availableTags | Where-Object { $_ -match "sitecore-xp(-custom)?-(?!.*spe|.*sxa|.*jss|.*ut).*:.*" }
125127

126128
$xcTags = $availableTags | Where-Object { $_ -match "sitecore-xc(-custom)?-(?!.*spe|.*sxa|.*jss).*:.*" }
127129

@@ -136,11 +138,12 @@ $xp0JssTags = $availableTags | Where-Object { $_ -match "sitecore-xp0(-custom)?-
136138
$xpSpeTags = $availableTags | Where-Object { $_ -match "sitecore-xp([1]{0,1})(-custom)?-(spe)(?!.*sxa).*:.*" }
137139
$xpSxaTags = $availableTags | Where-Object { $_ -match "sitecore-xp([1]{0,1})(-custom)?-(.*sxa)(?!.*jss).*:.*" }
138140
$xpJssTags = $availableTags | Where-Object { $_ -match "sitecore-xp([1]{0,1})(-custom)?-(.*jss).*:.*" }
141+
$xpUtTags = $availableTags | Where-Object { $_ -match "sitecore-xp([1]{0,1})(-custom)?-(.*ut).*:.*" }
139142

140143
$xcSpeTags = $availableTags | Where-Object { $_ -match "sitecore-xc-(spe).*:.*" }
141144
$xcSxaTags = $availableTags | Where-Object { $_ -match "sitecore-xc-(sxa).*:.*" }
142145

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

@@ -269,6 +272,14 @@ foreach ($wv in $OSVersion)
269272
$xpJssTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
270273
}
271274
}
275+
276+
if ($IncludeUt)
277+
{
278+
if ($Topology -eq "xp")
279+
{
280+
$xpUtTags | SitecoreFilter -Version $scv | WindowsFilter -Version $wv | ForEach-Object { $tags.Add($_) > $null }
281+
}
282+
}
272283
}
273284
}
274285

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[//]: # "start: stats"
44

5-
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg?style=flat-square)](https://opensource.org/licenses/MIT) ![Repositories](https://img.shields.io/badge/Repositories-151-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-886-blue.svg?style=flat-square) ![Deprecated](https://img.shields.io/badge/Deprecated-0-lightgrey.svg?style=flat-square) ![Dockerfiles](https://img.shields.io/badge/Dockerfiles-101-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-9.3.0%20on%20ltsc2019/1809-blue?style=flat-square)
5+
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg?style=flat-square)](https://opensource.org/licenses/MIT) ![Repositories](https://img.shields.io/badge/Repositories-154-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-898-blue.svg?style=flat-square) ![Deprecated](https://img.shields.io/badge/Deprecated-0-lightgrey.svg?style=flat-square) ![Dockerfiles](https://img.shields.io/badge/Dockerfiles-104-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-9.3.0%20on%20ltsc2019/1809-blue?style=flat-square)
66

77
[//]: # "end: stats"
88

‎build-images.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# - build.includeSpe
1818
# - build.includeSxa
1919
# - build.includeJss
20+
# - build.includeUt
2021
# - build.skipExistingImages
2122
# - build.includeExperimentalImages
2223

@@ -92,6 +93,7 @@ stages:
9293
IncludeSpe = [System.Convert]::ToBoolean($(build.includeSpe))
9394
IncludeSxa = [System.Convert]::ToBoolean($(build.includeSxa))
9495
IncludeJss = [System.Convert]::ToBoolean($(build.includeJss))
96+
IncludeUt = [System.Convert]::ToBoolean($(build.includeUt))
9597
IncludeExperimental = [System.Convert]::ToBoolean($(build.includeExperimentalImages))
9698
SkipExistingImage = [System.Convert]::ToBoolean($(build.skipExistingImages))
9799
}
@@ -154,6 +156,7 @@ stages:
154156
IncludeSpe = [System.Convert]::ToBoolean($(build.includeSpe))
155157
IncludeSxa = [System.Convert]::ToBoolean($(build.includeSxa))
156158
IncludeJss = [System.Convert]::ToBoolean($(build.includeJss))
159+
IncludeUt = [System.Convert]::ToBoolean($(build.includeUt))
157160
IncludeExperimental = [System.Convert]::ToBoolean($(build.includeExperimentalImages))
158161
SkipExistingImage = [System.Convert]::ToBoolean($(build.skipExistingImages))
159162
}

‎build/IMAGES.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
| 9.3.0 | sitecore-xp-xconnect-indexworker | windowsservercore | ltsc2019 | `sitecore-xp-xconnect-indexworker:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect-worker/Dockerfile) |
2222
| 9.3.0 | sitecore-xp-xconnect-automationengine | windowsservercore | ltsc2019 | `sitecore-xp-xconnect-automationengine:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect-worker/Dockerfile) |
2323
| 9.3.0 | sitecore-xp-xconnect | windowsservercore | ltsc2019 | `sitecore-xp-xconnect:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect/Dockerfile) |
24+
| 9.3.0 | sitecore-xp-ut-sqldev | windowsservercore | ltsc2019 | `sitecore-xp-ut-sqldev:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.3.x/sitecore-xp-ut-sqldev/Dockerfile) |
25+
| 9.3.0 | sitecore-xp-ut-processing | windowsservercore | ltsc2019 | `sitecore-xp-ut-processing:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.3.x/sitecore-xp-ut-processing/Dockerfile) |
26+
| 9.3.0 | sitecore-xp-ut-collection | windowsservercore | ltsc2019 | `sitecore-xp-ut-collection:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.3.x/sitecore-xp-ut-collection/Dockerfile) |
2427
| 9.3.0 | sitecore-xp-sxa-standalone | windowsservercore | ltsc2019 | `sitecore-xp-sxa-standalone:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.x.x/sitecore-sxa/Dockerfile) |
2528
| 9.3.0 | sitecore-xp-sxa-sqldev | windowsservercore | ltsc2019 | `sitecore-xp-sxa-sqldev:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.x.x/sitecore-sxa-sqldev/Dockerfile) |
2629
| 9.3.0 | sitecore-xp-sxa-ps-standalone | windowsservercore | ltsc2019 | `sitecore-xp-sxa-ps-standalone:9.3.0-windowsservercore-ltsc2019` [Dockerfile](windows/9.x.x/sitecore-sxa-ps/Dockerfile) |
@@ -106,6 +109,9 @@
106109
| 9.3.0 | sitecore-xp-xconnect-indexworker | windowsservercore | 2004 | `sitecore-xp-xconnect-indexworker:9.3.0-windowsservercore-2004` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect-worker/Dockerfile) |
107110
| 9.3.0 | sitecore-xp-xconnect-automationengine | windowsservercore | 2004 | `sitecore-xp-xconnect-automationengine:9.3.0-windowsservercore-2004` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect-worker/Dockerfile) |
108111
| 9.3.0 | sitecore-xp-xconnect | windowsservercore | 2004 | `sitecore-xp-xconnect:9.3.0-windowsservercore-2004` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect/Dockerfile) |
112+
| 9.3.0 | sitecore-xp-ut-sqldev | windowsservercore | 2004 | `sitecore-xp-ut-sqldev:9.3.0-windowsservercore-2004` [Dockerfile](windows/9.3.x/sitecore-xp-ut-sqldev/Dockerfile) |
113+
| 9.3.0 | sitecore-xp-ut-processing | windowsservercore | 2004 | `sitecore-xp-ut-processing:9.3.0-windowsservercore-2004` [Dockerfile](windows/9.3.x/sitecore-xp-ut-processing/Dockerfile) |
114+
| 9.3.0 | sitecore-xp-ut-collection | windowsservercore | 2004 | `sitecore-xp-ut-collection:9.3.0-windowsservercore-2004` [Dockerfile](windows/9.3.x/sitecore-xp-ut-collection/Dockerfile) |
109115
| 9.3.0 | sitecore-xp-sxa-standalone | windowsservercore | 2004 | `sitecore-xp-sxa-standalone:9.3.0-windowsservercore-2004` [Dockerfile](windows/9.x.x/sitecore-sxa/Dockerfile) |
110116
| 9.3.0 | sitecore-xp-sxa-sqldev | windowsservercore | 2004 | `sitecore-xp-sxa-sqldev:9.3.0-windowsservercore-2004` [Dockerfile](windows/9.x.x/sitecore-sxa-sqldev/Dockerfile) |
111117
| 9.3.0 | sitecore-xp-sxa-solr | nanoserver | 2004 | `sitecore-xp-sxa-solr:9.3.0-nanoserver-2004` [Dockerfile](windows/9.x.x/sitecore-xp-solr/Dockerfile) |
@@ -197,6 +203,9 @@
197203
| 9.3.0 | sitecore-xp-xconnect-indexworker | windowsservercore | 1909 | `sitecore-xp-xconnect-indexworker:9.3.0-windowsservercore-1909` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect-worker/Dockerfile) |
198204
| 9.3.0 | sitecore-xp-xconnect-automationengine | windowsservercore | 1909 | `sitecore-xp-xconnect-automationengine:9.3.0-windowsservercore-1909` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect-worker/Dockerfile) |
199205
| 9.3.0 | sitecore-xp-xconnect | windowsservercore | 1909 | `sitecore-xp-xconnect:9.3.0-windowsservercore-1909` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect/Dockerfile) |
206+
| 9.3.0 | sitecore-xp-ut-sqldev | windowsservercore | 1909 | `sitecore-xp-ut-sqldev:9.3.0-windowsservercore-1909` [Dockerfile](windows/9.3.x/sitecore-xp-ut-sqldev/Dockerfile) |
207+
| 9.3.0 | sitecore-xp-ut-processing | windowsservercore | 1909 | `sitecore-xp-ut-processing:9.3.0-windowsservercore-1909` [Dockerfile](windows/9.3.x/sitecore-xp-ut-processing/Dockerfile) |
208+
| 9.3.0 | sitecore-xp-ut-collection | windowsservercore | 1909 | `sitecore-xp-ut-collection:9.3.0-windowsservercore-1909` [Dockerfile](windows/9.3.x/sitecore-xp-ut-collection/Dockerfile) |
200209
| 9.3.0 | sitecore-xp-sxa-standalone | windowsservercore | 1909 | `sitecore-xp-sxa-standalone:9.3.0-windowsservercore-1909` [Dockerfile](windows/9.x.x/sitecore-sxa/Dockerfile) |
201210
| 9.3.0 | sitecore-xp-sxa-sqldev | windowsservercore | 1909 | `sitecore-xp-sxa-sqldev:9.3.0-windowsservercore-1909` [Dockerfile](windows/9.x.x/sitecore-sxa-sqldev/Dockerfile) |
202211
| 9.3.0 | sitecore-xp-sxa-solr | nanoserver | 1909 | `sitecore-xp-sxa-solr:9.3.0-nanoserver-1909` [Dockerfile](windows/9.x.x/sitecore-xp-solr/Dockerfile) |
@@ -288,6 +297,9 @@
288297
| 9.3.0 | sitecore-xp-xconnect-indexworker | windowsservercore | 1903 | `sitecore-xp-xconnect-indexworker:9.3.0-windowsservercore-1903` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect-worker/Dockerfile) |
289298
| 9.3.0 | sitecore-xp-xconnect-automationengine | windowsservercore | 1903 | `sitecore-xp-xconnect-automationengine:9.3.0-windowsservercore-1903` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect-worker/Dockerfile) |
290299
| 9.3.0 | sitecore-xp-xconnect | windowsservercore | 1903 | `sitecore-xp-xconnect:9.3.0-windowsservercore-1903` [Dockerfile](windows/9.3.x/sitecore-xp-xconnect/Dockerfile) |
300+
| 9.3.0 | sitecore-xp-ut-sqldev | windowsservercore | 1903 | `sitecore-xp-ut-sqldev:9.3.0-windowsservercore-1903` [Dockerfile](windows/9.3.x/sitecore-xp-ut-sqldev/Dockerfile) |
301+
| 9.3.0 | sitecore-xp-ut-processing | windowsservercore | 1903 | `sitecore-xp-ut-processing:9.3.0-windowsservercore-1903` [Dockerfile](windows/9.3.x/sitecore-xp-ut-processing/Dockerfile) |
302+
| 9.3.0 | sitecore-xp-ut-collection | windowsservercore | 1903 | `sitecore-xp-ut-collection:9.3.0-windowsservercore-1903` [Dockerfile](windows/9.3.x/sitecore-xp-ut-collection/Dockerfile) |
291303
| 9.3.0 | sitecore-xp-sxa-standalone | windowsservercore | 1903 | `sitecore-xp-sxa-standalone:9.3.0-windowsservercore-1903` [Dockerfile](windows/9.x.x/sitecore-sxa/Dockerfile) |
292304
| 9.3.0 | sitecore-xp-sxa-sqldev | windowsservercore | 1903 | `sitecore-xp-sxa-sqldev:9.3.0-windowsservercore-1903` [Dockerfile](windows/9.x.x/sitecore-sxa-sqldev/Dockerfile) |
293305
| 9.3.0 | sitecore-xp-sxa-solr | nanoserver | 1903 | `sitecore-xp-sxa-solr:9.3.0-nanoserver-1903` [Dockerfile](windows/9.x.x/sitecore-xp-solr/Dockerfile) |

‎build/sitecore-packages.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,10 @@
231231
"url": "https://dev.sitecore.net/~/media/3BA8C0FD6894405ABF3CD53803007272.ashx",
232232
"hash": "9A7841C0773443BF07E8789EB99ACC90A6CE64326B5B67B0904671B3CC2401AA"
233233
},
234+
"Sitecore Universal Tracker 3.0.0.zip": {
235+
"url": "https://dev.sitecore.net/~/media/4B3AA63825BD482F85ED794290210E8A.ashx",
236+
"hash": "44C2043976D5C86B290E8FACA840618C6BFF9FBF978DC3A6205E0F820DE61072"
237+
},
234238
"Sitecore.Commerce.WDP.2019.07-4.0.165.zip": {
235239
"url": "https://dev.sitecore.net/~/media/07F9ABE455944146B37E9D71CA781A27.ashx",
236240
"hash": "C9CA7ABA49FBCE70AABFEA6E8C04780D051845FFEEF83ACCADFEE52DED8E8574"

‎build/windows/9.3.0/sitecore-assets/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ RUN $zips = Get-ChildItem -Path 'C:\\downloads\\*.zip' -Exclude @('*.scwdp.zip',
4545
$zips | ForEach-Object { Remove-Item -Path $_.FullName -Force; }; `
4646
$zips = Get-ChildItem -Path 'C:\\downloads\\*.zip' -Exclude '*Configuration files*.zip'; `
4747
$zips | ForEach-Object { Move-Item -Path $_.FullName -Destination 'C:\\packages'; }; `
48-
$zips = Get-ChildItem -Path 'C:\\packages\\*.scwdp.zip' | Rename-Item -NewName {$_.Name -replace '.rev\..(\d*)|(r[0-9]+.[0-9]+)'};
48+
$zips = Get-ChildItem -Path 'C:\\packages\\*.scwdp.zip' | Rename-Item -NewName {$_.Name -replace '.rev\..(\d*)|(r[0-9]+.[0-9]+)'}; `
49+
$zips = Get-ChildItem -Path 'C:\\packages\\*.deploy.zip' | ForEach-Object { Remove-Item -Path $_.FullName -Force; };
4950

5051
# move installers
5152
RUN New-Item -Path 'C:\\install\\setup' -ItemType 'Directory' -Force | Out-Null; `

‎build/windows/9.3.0/sitecore-assets/build.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"Sitecore JavaScript Services Server for Sitecore 9.3 XP 13.0.0 rev. 190924.scwdp.zip",
2424
"Sitecore.PowerShell.Extensions-6.0.scwdp.zip",
2525
"Sitecore Publishing Service 4.2.0-win-x64.zip",
26-
"Sitecore Publishing Module 9.3.0.0 rev. r00546.2197.scwdp.zip"
26+
"Sitecore Publishing Module 9.3.0.0 rev. r00546.2197.scwdp.zip",
27+
"Sitecore Universal Tracker 3.0.0.zip"
2728
]
2829
}

‎build/windows/9.3.0/sitecore-assets/tools/entrypoints/ut-processing/Development.ps1‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
[CmdletBinding()]
2+
param(
3+
[Parameter(Mandatory = $false)]
4+
[hashtable]$WatchDirectoryParameters
5+
)
6+
7+
# setup
8+
$ErrorActionPreference = "STOP"
9+
10+
$timeFormat = "HH:mm:ss:fff"
11+
12+
# print start message
13+
Write-Host ("$(Get-Date -Format $timeFormat): Universal Tracker Processing Development ENTRYPOINT, starting...")
14+
15+
# check to see if we should start the Watch-Directory.ps1 script
16+
$watchDirectoryJobName = "Watch-Directory.ps1"
17+
$useWatchDirectory = $null -ne $WatchDirectoryParameters -bor (Test-Path -Path "C:\src" -PathType "Container") -eq $true
18+
19+
if ($useWatchDirectory)
20+
{
21+
# setup default parameters if none is supplied
22+
if ($null -eq $WatchDirectoryParameters)
23+
{
24+
$WatchDirectoryParameters = @{ Path = "C:\src"; Destination = "C:\inetpub\wwwroot"; }
25+
}
26+
27+
# start Watch-Directory.ps1 in background, kill foreground process if it fails
28+
Start-Job -Name $watchDirectoryJobName -ArgumentList $WatchDirectoryParameters -ScriptBlock {
29+
param([hashtable]$params)
30+
31+
& "C:\tools\scripts\Watch-Directory.ps1" @params
32+
33+
} | Out-Null
34+
35+
# wait to see if job have failed (it will if for example parsing in invalid parameters)...
36+
Start-Sleep -Milliseconds 1000
37+
38+
Get-Job -Name $watchDirectoryJobName | ForEach-Object {
39+
$job = $_
40+
41+
if ($job.State -ne "Running")
42+
{
43+
# writes output stream
44+
Receive-Job $job
45+
46+
# exit
47+
exit 1
48+
}
49+
50+
Write-Host "$(Get-Date -Format $timeFormat): Job '$($job.Name)' started..."
51+
}
52+
}
53+
else
54+
{
55+
Write-Host ("$(Get-Date -Format $timeFormat): Skipping start of '$watchDirectoryJobName', to enable you should mount a directory into 'C:\src'.")
56+
}
57+
58+
& "C:\\inetpub\\wwwroot\\$($env:SC_ROLE_EXE)"

0 commit comments

Comments
 (0)