From 28c709801ae0e784634d8b11fee26855e8d236bf Mon Sep 17 00:00:00 2001
From: Bart Plasmeijer <bart.plasmeijer@valtech.com>
Date: Tue, 22 Oct 2019 16:30:42 +0200
Subject: [PATCH 1/4] added: XM JSS and XP JSS

---
 IMAGES.md                                     | Bin 15173 -> 34844 bytes
 README.md                                     | Bin 5624 -> 11518 bytes
 Update-Readme.ps1 => Update-Documentation.ps1 |   0
 sitecore-packages.json                        |  18 ++++-
 .../9.2.x/sitecore-xm-jss-sqldev/Dockerfile   |  21 +++++
 .../Extract-Databases.ps1                     |  35 +++++++++
 .../Install-Databases.ps1                     |  61 +++++++++++++++
 .../9.2.x/sitecore-xm-jss-sqldev/build.json   |  14 ++++
 windows/9.2.x/sitecore-xm-jss/Dockerfile      |  29 +++++++
 windows/9.2.x/sitecore-xm-jss/build.json      |  25 ++++++
 .../9.2.x/sitecore-xp-jss-sqldev/Dockerfile   |  22 ++++++
 .../Extract-Databases.ps1                     |  35 +++++++++
 .../Install-Databases.ps1                     |  61 +++++++++++++++
 .../9.2.x/sitecore-xp-jss-sqldev/build.json   |  14 ++++
 windows/9.2.x/sitecore-xp-jss/Dockerfile      |  22 ++++++
 windows/9.2.x/sitecore-xp-jss/build.json      |  25 ++++++
 windows/tests/9.x.x/docker-compose-jss.xp.yml |  73 ++++++++++++++++++
 windows/tests/9.x.x/docker-compose.jss.xm.yml |  46 +++++++++++
 windows/tests/9.x.x/docker-compose.spe.xm.yml |   4 +-
 19 files changed, 502 insertions(+), 3 deletions(-)
 rename Update-Readme.ps1 => Update-Documentation.ps1 (100%)
 create mode 100644 windows/9.2.x/sitecore-xm-jss-sqldev/Dockerfile
 create mode 100644 windows/9.2.x/sitecore-xm-jss-sqldev/Extract-Databases.ps1
 create mode 100644 windows/9.2.x/sitecore-xm-jss-sqldev/Install-Databases.ps1
 create mode 100644 windows/9.2.x/sitecore-xm-jss-sqldev/build.json
 create mode 100644 windows/9.2.x/sitecore-xm-jss/Dockerfile
 create mode 100644 windows/9.2.x/sitecore-xm-jss/build.json
 create mode 100644 windows/9.2.x/sitecore-xp-jss-sqldev/Dockerfile
 create mode 100644 windows/9.2.x/sitecore-xp-jss-sqldev/Extract-Databases.ps1
 create mode 100644 windows/9.2.x/sitecore-xp-jss-sqldev/Install-Databases.ps1
 create mode 100644 windows/9.2.x/sitecore-xp-jss-sqldev/build.json
 create mode 100644 windows/9.2.x/sitecore-xp-jss/Dockerfile
 create mode 100644 windows/9.2.x/sitecore-xp-jss/build.json
 create mode 100644 windows/tests/9.x.x/docker-compose-jss.xp.yml
 create mode 100644 windows/tests/9.x.x/docker-compose.jss.xm.yml

diff --git a/IMAGES.md b/IMAGES.md
index d844be722f830619ca8c520a8da478b6082be7c2..a8a5107cfd179065cf5899de960146df43f8d587 100644
GIT binary patch
literal 34844
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
WGU_lQ)R|&Lye8|f|6J}*_1J%0fufWE

literal 15173
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
AH~;_u

diff --git a/README.md b/README.md
index a9ae83a376c2e2272dc76cb8e54d80a3a3bfd760..45bd8d51a884f645545f2b117293d2e4a392dc18 100644
GIT binary patch
literal 11518
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
Dfvku1

literal 5624
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

diff --git a/Update-Readme.ps1 b/Update-Documentation.ps1
similarity index 100%
rename from Update-Readme.ps1
rename to Update-Documentation.ps1
diff --git a/sitecore-packages.json b/sitecore-packages.json
index 8e142b8e2..aaf630e0a 100644
--- a/sitecore-packages.json
+++ b/sitecore-packages.json
@@ -190,7 +190,7 @@
   "Sitecore Experience Accelerator XM 1.8.1 rev. 190319 for 9.1.1.scwdp.zip": {
     "description": "Sitecore Experience Accelerator 1.8 Update-1",
     "url": "https://dev.sitecore.net/~/media/F8CFFFD23CD54178B5749B0ECACB5813.ashx"
-  }, 
+  },
   "Sitecore Experience Accelerator XM 1.8.1 rev. 190319 for 9.1.1 CD.scwdp.zip": {
     "description": "Sitecore Experience Accelerator 1.8 Update-1",
     "url": "https://dev.sitecore.net/~/media/768039F8BCB24FB5A78AA99AD4391A20.ashx"
@@ -294,5 +294,21 @@
   "Web Forms for Marketers 9.0 rev. 180503.zip": {
     "description": "Web Forms for Marketers 9.0 Update-2",
     "url": "https://dev.sitecore.net/~/media/3BFEB7C427D040178E619522EA272ECC.ashx"
+  },
+  "Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522 CD.scwdp.zip": {
+    "description": "Sitecore JavaScript Services Server CD WDP for Sitecore 9.2 XM",
+    "url": "https://dev.sitecore.net/~/media/AEB49B787A534166A6C7D6B377367776.ashx"
+  },
+  "Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522 CD.scwdp.zip": {
+    "description": "Sitecore JavaScript Services Server CD WDP for Sitecore 9.2 XP",
+    "url": "https://dev.sitecore.net/~/media/187F48001A174051A7B085377838295F.ashx"
+  },
+  "Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522.scwdp.zip": {
+    "description": "Sitecore JavaScript Services Server WDP for Sitecore 9.2 XM",
+    "url": "https://dev.sitecore.net/~/media/305523FA736948C9855A8B0539FF1680.ashx"
+  },
+  "Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522.scwdp.zip": {
+    "description": "Sitecore JavaScript Services Server WDP for Sitecore 9.2 XP",
+    "url": "https://dev.sitecore.net/~/media/1D5D53DE1F4B43E8B3D70E0D0EE40A5D.ashx"
   }
 }
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss-sqldev/Dockerfile b/windows/9.2.x/sitecore-xm-jss-sqldev/Dockerfile
new file mode 100644
index 000000000..d961bf35b
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss-sqldev/Dockerfile
@@ -0,0 +1,21 @@
+# escape=`
+ARG BASE_IMAGE
+ARG ASSETS_IMAGE
+
+FROM $ASSETS_IMAGE as assets
+FROM $BASE_IMAGE as build
+
+ARG ASSETS_USE_WDP
+
+ENV INSTALL_PATH='C:\\install\\' `
+    INSTALL_MODULE_PATH='C:\\install-module\\' `
+    DATA_PATH='C:\\data\\' `
+    TEMP_PATH='c:\\temp'
+
+COPY --from=assets ["${ASSETS_USE_WDP}", "${INSTALL_MODULE_PATH}"]
+COPY . ${INSTALL_MODULE_PATH}
+
+RUN & (Join-Path $env:INSTALL_MODULE_PATH "\\Extract-Databases.ps1") -Path $env:INSTALL_MODULE_PATH; `
+    & (Join-Path $env:INSTALL_MODULE_PATH "\\Install-Databases.ps1") -InstallPath $env:INSTALL_PATH -DataPath $env:DATA_PATH -ModulePath $env:INSTALL_MODULE_PATH -DatabasePrefix Sitecore; `
+    Get-ChildItem -Path $env:INSTALL_PATH -Exclude "*.mdf", "*.ldf" | Remove-Item -Force; `
+    Get-ChildItem -Path $env:INSTALL_MODULE_PATH | Remove-Item -Force;
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss-sqldev/Extract-Databases.ps1 b/windows/9.2.x/sitecore-xm-jss-sqldev/Extract-Databases.ps1
new file mode 100644
index 000000000..9b7b11d7c
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss-sqldev/Extract-Databases.ps1
@@ -0,0 +1,35 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })]
+    [string]$Path
+)
+
+Add-Type -Assembly "System.IO.Compression"
+Add-Type -Assembly "System.IO.Compression.FileSystem"
+
+Get-ChildItem -Path $Path -Filter "*.zip" | ForEach-Object {
+    $zipPath = $_.FullName
+
+    try
+    {
+        $stream = New-Object IO.FileStream($zipPath, [IO.FileMode]::Open)
+        $zip = New-Object IO.Compression.ZipArchive($stream, [IO.Compression.ZipArchiveMode]::Read)
+
+        ($zip.Entries | Where-Object { $_.FullName -like "*.dacpac" }) | Foreach-Object {
+            [IO.Compression.ZipFileExtensions]::ExtractToFile($_, (Join-Path $Path $_.Name), $true)
+        }
+    }
+    finally
+    {
+        if ($zip -ne $null)
+        {
+            $zip.Dispose()
+        }
+
+        if ($stream -ne $null)
+        {
+            $stream.Dispose()
+        }
+    }
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss-sqldev/Install-Databases.ps1 b/windows/9.2.x/sitecore-xm-jss-sqldev/Install-Databases.ps1
new file mode 100644
index 000000000..d9ef08c20
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss-sqldev/Install-Databases.ps1
@@ -0,0 +1,61 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$InstallPath,
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$DataPath,
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$ModulePath,
+    [Parameter(Mandatory = $true)]
+    [ValidateNotNullOrEmpty()] 
+    [string]$DatabasePrefix
+)
+
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | Out-Null
+
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server($env:COMPUTERNAME)
+$server.Properties["DefaultFile"].Value = $InstallPath
+$server.Properties["DefaultLog"].Value = $InstallPath
+$server.Alter()
+
+$sqlPackageExePath = Get-Item "C:\Program Files\Microsoft SQL Server\*\DAC\bin\SqlPackage.exe" | Select-Object -Last 1 -Property FullName -ExpandProperty FullName
+
+# attach
+Get-ChildItem -Path $InstallPath -Filter "*.mdf" | ForEach-Object {
+    $databaseName = $_.BaseName.Replace("_Primary", "")
+    $mdfPath = $_.FullName
+    $ldfPath = $mdfPath.Replace(".mdf", ".ldf")
+    $sqlcmd = "IF EXISTS (SELECT 1 FROM SYS.DATABASES WHERE NAME = '$databaseName') BEGIN EXEC sp_detach_db [$databaseName] END;CREATE DATABASE [$databaseName] ON (FILENAME = N'$mdfPath'), (FILENAME = N'$ldfPath') FOR ATTACH;"
+
+    Write-Host "### Attaching '$databaseName'..."
+
+    Invoke-Sqlcmd -Query $sqlcmd
+}
+
+# do modules
+$TextInfo = (Get-Culture).TextInfo
+Get-ChildItem -Path $ModulePath -Include "core.dacpac", "master.dacpac" -Recurse | ForEach-Object { 
+
+    $dacpacPath = $_.FullName
+    $databaseName = "$DatabasePrefix`." + $TextInfo.ToTitleCase($_.BaseName)
+
+    # Install
+    & $sqlPackageExePath /a:Publish /sf:$dacpacPath /tdn:$databaseName /tsn:$env:COMPUTERNAME /q
+} 
+
+# detach DB
+Get-ChildItem -Path $InstallPath -Filter "*.mdf" | ForEach-Object {
+    $databaseName = $_.BaseName.Replace("_Primary", "")
+
+    Write-Host "### Detach: $databaseName"
+
+    Invoke-Sqlcmd -Query "EXEC MASTER.dbo.sp_detach_db @dbname = N'$databaseName', @keepfulltextindexfile = N'false'"
+}
+
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server($env:COMPUTERNAME)
+$server.Properties["DefaultFile"].Value = $DataPath
+$server.Properties["DefaultLog"].Value = $DataPath
+$server.Alter()
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss-sqldev/build.json b/windows/9.2.x/sitecore-xm-jss-sqldev/build.json
new file mode 100644
index 000000000..127b0407a
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss-sqldev/build.json
@@ -0,0 +1,14 @@
+{
+  "tags": [
+    {
+      "tag": "sitecore-xm-jss-sqldev:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--memory 4GB",
+        "--build-arg BASE_IMAGE=sitecore-xm-sqldev:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522.scwdp.zip'"
+      ]
+    }
+  ],
+  "sources": []
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss/Dockerfile b/windows/9.2.x/sitecore-xm-jss/Dockerfile
new file mode 100644
index 000000000..8f77f4573
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss/Dockerfile
@@ -0,0 +1,29 @@
+# escape=`
+ARG BASE_IMAGE
+ARG ASSETS_IMAGE
+
+FROM $ASSETS_IMAGE as assets
+FROM $BASE_IMAGE as build
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG ASSETS_USE_WDP
+
+COPY --from=assets ["${ASSETS_USE_WDP}", "C:\\temp\\packages\\"]
+
+# expand selected wdp into installation directory
+RUN Expand-Archive -Path 'C:\\temp\\packages\\*.zip' -DestinationPath 'C:\\temp'; `
+    Copy-Item -Path 'C:\\temp\\Content\\Website\\*' -Destination 'C:\\inetpub\\wwwroot' -Recurse -Force;
+
+# copy tools and transforms
+COPY --from=assets ["C:\\install\\tools\\", "C:\\install\\tools\\"]
+
+# find transform files and do transformation
+RUN (Get-ChildItem -Path 'C:\\inetpub\\wwwroot\\*.xdt' -Recurse ) | ForEach-Object { & 'C:\\install\\tools\\scripts\\Invoke-XdtTransform.ps1' -Path 'C:\\inetpub\\wwwroot\\web.config' -XdtPath $_.FullName -XdtDllPath 'C:\\install\\tools\\bin\\Microsoft.Web.XmlTransform.dll'; }; 
+
+FROM $BASE_IMAGE
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+COPY --from=build ["C:\\inetpub\\wwwroot\\", "C:\\inetpub\\wwwroot\\"]
+
diff --git a/windows/9.2.x/sitecore-xm-jss/build.json b/windows/9.2.x/sitecore-xm-jss/build.json
new file mode 100644
index 000000000..9faf6b465
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss/build.json
@@ -0,0 +1,25 @@
+{
+  "tags": [
+    {
+      "tag": "sitecore-xm-jss-cm:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=sitecore-xm-cm:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522.scwdp.zip'",
+        "--build-arg SC_ROLE_CONFIG_DIRECTORY=\\config\\cm",
+        "--build-arg SC_ROLE_DEFINE='ContentManagement, Indexing'"
+      ]
+    },
+    {
+      "tag": "sitecore-xm-jss-cd:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=sitecore-xm-cd:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522 CD.scwdp.zip'",
+        "--build-arg SC_ROLE_CONFIG_DIRECTORY=.\\config\\cd",
+        "--build-arg SC_ROLE_DEFINE='ContentDelivery'"
+      ]
+    }
+  ],
+  "sources": []
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss-sqldev/Dockerfile b/windows/9.2.x/sitecore-xp-jss-sqldev/Dockerfile
new file mode 100644
index 000000000..80411e619
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss-sqldev/Dockerfile
@@ -0,0 +1,22 @@
+# escape=`
+ARG BASE_IMAGE
+ARG ASSETS_IMAGE
+
+FROM $ASSETS_IMAGE as assets
+FROM $BASE_IMAGE as build
+
+ARG ASSETS_USE_WDP
+
+ENV INSTALL_PATH='C:\\install\\' `
+    INSTALL_MODULE_PATH='C:\\install-module\\' `
+    DATA_PATH='C:\\data\\' `
+    TEMP_PATH='c:\\temp'
+
+COPY --from=assets ["${ASSETS_USE_WDP}", "${INSTALL_MODULE_PATH}"]
+
+COPY . ${INSTALL_MODULE_PATH}
+
+RUN & (Join-Path $env:INSTALL_MODULE_PATH "\\Extract-Databases.ps1") -Path $env:INSTALL_MODULE_PATH; `
+    & (Join-Path $env:INSTALL_MODULE_PATH "\\Install-Databases.ps1") -InstallPath $env:INSTALL_PATH -DataPath $env:DATA_PATH -ModulePath $env:INSTALL_MODULE_PATH -DatabasePrefix Sitecore; `
+    Get-ChildItem -Path $env:INSTALL_PATH -Exclude "*.mdf", "*.ldf" | Remove-Item -Force; `
+    Get-ChildItem -Path $env:INSTALL_MODULE_PATH | Remove-Item -Force;  
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss-sqldev/Extract-Databases.ps1 b/windows/9.2.x/sitecore-xp-jss-sqldev/Extract-Databases.ps1
new file mode 100644
index 000000000..9b7b11d7c
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss-sqldev/Extract-Databases.ps1
@@ -0,0 +1,35 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })]
+    [string]$Path
+)
+
+Add-Type -Assembly "System.IO.Compression"
+Add-Type -Assembly "System.IO.Compression.FileSystem"
+
+Get-ChildItem -Path $Path -Filter "*.zip" | ForEach-Object {
+    $zipPath = $_.FullName
+
+    try
+    {
+        $stream = New-Object IO.FileStream($zipPath, [IO.FileMode]::Open)
+        $zip = New-Object IO.Compression.ZipArchive($stream, [IO.Compression.ZipArchiveMode]::Read)
+
+        ($zip.Entries | Where-Object { $_.FullName -like "*.dacpac" }) | Foreach-Object {
+            [IO.Compression.ZipFileExtensions]::ExtractToFile($_, (Join-Path $Path $_.Name), $true)
+        }
+    }
+    finally
+    {
+        if ($zip -ne $null)
+        {
+            $zip.Dispose()
+        }
+
+        if ($stream -ne $null)
+        {
+            $stream.Dispose()
+        }
+    }
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss-sqldev/Install-Databases.ps1 b/windows/9.2.x/sitecore-xp-jss-sqldev/Install-Databases.ps1
new file mode 100644
index 000000000..d9ef08c20
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss-sqldev/Install-Databases.ps1
@@ -0,0 +1,61 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$InstallPath,
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$DataPath,
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$ModulePath,
+    [Parameter(Mandatory = $true)]
+    [ValidateNotNullOrEmpty()] 
+    [string]$DatabasePrefix
+)
+
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | Out-Null
+
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server($env:COMPUTERNAME)
+$server.Properties["DefaultFile"].Value = $InstallPath
+$server.Properties["DefaultLog"].Value = $InstallPath
+$server.Alter()
+
+$sqlPackageExePath = Get-Item "C:\Program Files\Microsoft SQL Server\*\DAC\bin\SqlPackage.exe" | Select-Object -Last 1 -Property FullName -ExpandProperty FullName
+
+# attach
+Get-ChildItem -Path $InstallPath -Filter "*.mdf" | ForEach-Object {
+    $databaseName = $_.BaseName.Replace("_Primary", "")
+    $mdfPath = $_.FullName
+    $ldfPath = $mdfPath.Replace(".mdf", ".ldf")
+    $sqlcmd = "IF EXISTS (SELECT 1 FROM SYS.DATABASES WHERE NAME = '$databaseName') BEGIN EXEC sp_detach_db [$databaseName] END;CREATE DATABASE [$databaseName] ON (FILENAME = N'$mdfPath'), (FILENAME = N'$ldfPath') FOR ATTACH;"
+
+    Write-Host "### Attaching '$databaseName'..."
+
+    Invoke-Sqlcmd -Query $sqlcmd
+}
+
+# do modules
+$TextInfo = (Get-Culture).TextInfo
+Get-ChildItem -Path $ModulePath -Include "core.dacpac", "master.dacpac" -Recurse | ForEach-Object { 
+
+    $dacpacPath = $_.FullName
+    $databaseName = "$DatabasePrefix`." + $TextInfo.ToTitleCase($_.BaseName)
+
+    # Install
+    & $sqlPackageExePath /a:Publish /sf:$dacpacPath /tdn:$databaseName /tsn:$env:COMPUTERNAME /q
+} 
+
+# detach DB
+Get-ChildItem -Path $InstallPath -Filter "*.mdf" | ForEach-Object {
+    $databaseName = $_.BaseName.Replace("_Primary", "")
+
+    Write-Host "### Detach: $databaseName"
+
+    Invoke-Sqlcmd -Query "EXEC MASTER.dbo.sp_detach_db @dbname = N'$databaseName', @keepfulltextindexfile = N'false'"
+}
+
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server($env:COMPUTERNAME)
+$server.Properties["DefaultFile"].Value = $DataPath
+$server.Properties["DefaultLog"].Value = $DataPath
+$server.Alter()
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss-sqldev/build.json b/windows/9.2.x/sitecore-xp-jss-sqldev/build.json
new file mode 100644
index 000000000..a31bff00b
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss-sqldev/build.json
@@ -0,0 +1,14 @@
+{
+  "tags": [
+    {
+      "tag": "sitecore-xp-jss-sqldev:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--memory 4GB",
+        "--build-arg BASE_IMAGE=sitecore-xp-sqldev:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522.scwdp.zip'"
+      ]
+    }
+  ],
+  "sources": []
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss/Dockerfile b/windows/9.2.x/sitecore-xp-jss/Dockerfile
new file mode 100644
index 000000000..a9fcb1599
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss/Dockerfile
@@ -0,0 +1,22 @@
+# escape=`
+ARG BASE_IMAGE
+ARG ASSETS_IMAGE
+
+FROM $ASSETS_IMAGE as assets
+FROM $BASE_IMAGE as build
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG ASSETS_USE_WDP
+
+COPY --from=assets ["${ASSETS_USE_WDP}", "C:\\temp\\packages\\"]
+
+# expand selected wdp into installation directory
+RUN Expand-Archive -Path 'C:\\temp\\packages\\*.zip' -DestinationPath 'C:\\temp'; `
+    Copy-Item -Path 'C:\\temp\\Content\\Website\\*' -Destination 'C:\\inetpub\\wwwroot' -Recurse -Force;
+
+FROM $BASE_IMAGE
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+COPY --from=build ["C:\\inetpub\\wwwroot\\", "C:\\inetpub\\wwwroot\\"]
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss/build.json b/windows/9.2.x/sitecore-xp-jss/build.json
new file mode 100644
index 000000000..06dec1c51
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss/build.json
@@ -0,0 +1,25 @@
+{
+  "tags": [
+    {
+      "tag": "sitecore-xp-jss-standalone:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=sitecore-xp-standalone:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522.scwdp.zip'",
+        "--build-arg SC_ROLE_CONFIG_DIRECTORY=\\config\\cm",
+        "--build-arg SC_ROLE_DEFINE='ContentManagement, Indexing'"
+      ]
+    },
+    {
+      "tag": "sitecore-xp-jss-cd:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=sitecore-xp-cd:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522 CD.scwdp.zip'",
+        "--build-arg SC_ROLE_CONFIG_DIRECTORY=\\config\\cd",
+        "--build-arg SC_ROLE_DEFINE='ContentDelivery'"
+      ]
+    }
+  ],
+  "sources": []
+}
\ No newline at end of file
diff --git a/windows/tests/9.x.x/docker-compose-jss.xp.yml b/windows/tests/9.x.x/docker-compose-jss.xp.yml
new file mode 100644
index 000000000..f942bbf2a
--- /dev/null
+++ b/windows/tests/9.x.x/docker-compose-jss.xp.yml
@@ -0,0 +1,73 @@
+version: '2.4'
+
+services:
+
+  sql:
+    image: ${REGISTRY}sitecore-xp-jss-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - .\data\sql:C:\Data
+    mem_limit: 2GB
+    ports:
+      - "44010:1433"
+
+  solr:
+    image: ${REGISTRY}sitecore-xp-solr:${SITECORE_VERSION}-nanoserver-${NANOSERVER_VERSION}
+    volumes:
+      - .\data\solr:C:\Data
+    mem_limit: 1GB
+    ports:
+      - "44011:8983"
+
+  xconnect:
+    image: ${REGISTRY}sitecore-xp-xconnect:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\xconnect:C:\inetpub\wwwroot\App_Data\logs
+    mem_limit: 1GB
+    links:
+      - sql
+      - solr
+
+  xconnect-automationengine:
+    image: ${REGISTRY}sitecore-xp-xconnect-automationengine:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\xconnect-automationengine:C:\AutomationEngine\App_Data\logs
+    mem_limit: 500MB
+    links:
+      - sql
+      - xconnect
+
+  xconnect-indexworker:
+    image: ${REGISTRY}sitecore-xp-xconnect-indexworker:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\xconnect-indexworker:C:\IndexWorker\App_Data\logs
+    mem_limit: 500MB
+    links:
+      - sql
+      - solr
+
+  cd:
+    image: ${REGISTRY}sitecore-xp-jss-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
+      - xconnect
+
+  cm:
+    image: ${REGISTRY}sitecore-xp-jss-standalone:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44001:80"
+    links:
+      - sql
+      - solr
+      - xconnect
diff --git a/windows/tests/9.x.x/docker-compose.jss.xm.yml b/windows/tests/9.x.x/docker-compose.jss.xm.yml
new file mode 100644
index 000000000..f9bcbbace
--- /dev/null
+++ b/windows/tests/9.x.x/docker-compose.jss.xm.yml
@@ -0,0 +1,46 @@
+version: '2.4'
+
+services:
+
+  sql:
+    image: ${REGISTRY}sitecore-xm-jss-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - .\data\sql:C:\Data
+    mem_limit: 2GB
+    ports:
+      - "44010:1433"
+
+  solr:
+    image: ${REGISTRY}sitecore-xm-solr:${SITECORE_VERSION}-nanoserver-${NANOSERVER_VERSION}
+    volumes:
+      - .\data\solr:C:\Data
+    mem_limit: 1GB
+    ports:
+      - "44011:8983"
+
+  # cd:
+  #   image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+  #   volumes:
+  #     - C:\license:C:\license
+  #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+  #   ports:
+  #     - "44002:80"
+  #   links:
+  #     - sql
+  #     - solr
+
+  cm:
+    image: ${REGISTRY}sitecore-xm-jss-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - C:\license:C:\license
+      - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44001:80"
+    links:
+      - sql
+      - solr
+
+networks:
+  default:
+    external:
+      name: nat
\ No newline at end of file
diff --git a/windows/tests/9.x.x/docker-compose.spe.xm.yml b/windows/tests/9.x.x/docker-compose.spe.xm.yml
index 4a965ffd6..f7ea64974 100644
--- a/windows/tests/9.x.x/docker-compose.spe.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.spe.xm.yml
@@ -3,7 +3,7 @@ version: '2.4'
 services:
 
   sql:
-    image: ${REGISTRY}sitecore-spe-xm-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    image: ${REGISTRY}sitecore-xm-spe-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
       - .\data\sql:C:\Data
     mem_limit: 2GB
@@ -30,7 +30,7 @@ services:
   #     - solr
 
   cm:
-    image: ${REGISTRY}sitecore-spe-xm-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    image: ${REGISTRY}sitecore-xm-spe-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
       - C:\license:C:\license
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs

From 5065cf14870cdb4ed9f0c954f3f82fc1601933fb Mon Sep 17 00:00:00 2001
From: Bart Plasmeijer <bart.plasmeijer@valtech.com>
Date: Tue, 22 Oct 2019 16:49:37 +0200
Subject: [PATCH 2/4] apply fixes

---
 windows/9.2.x/sitecore-xp-jss/build.json      | 2 +-
 windows/tests/9.x.x/docker-compose.jss.xm.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/windows/9.2.x/sitecore-xp-jss/build.json b/windows/9.2.x/sitecore-xp-jss/build.json
index 06dec1c51..956a19538 100644
--- a/windows/9.2.x/sitecore-xp-jss/build.json
+++ b/windows/9.2.x/sitecore-xp-jss/build.json
@@ -7,7 +7,7 @@
         "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
         "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522.scwdp.zip'",
         "--build-arg SC_ROLE_CONFIG_DIRECTORY=\\config\\cm",
-        "--build-arg SC_ROLE_DEFINE='ContentManagement, Indexing'"
+        "--build-arg SC_ROLE_DEFINE='Standalone'"
       ]
     },
     {
diff --git a/windows/tests/9.x.x/docker-compose.jss.xm.yml b/windows/tests/9.x.x/docker-compose.jss.xm.yml
index f9bcbbace..2e6fc777b 100644
--- a/windows/tests/9.x.x/docker-compose.jss.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.jss.xm.yml
@@ -19,7 +19,7 @@ services:
       - "44011:8983"
 
   # cd:
-  #   image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+  #   image: ${REGISTRY}sitecore-xm-jss-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
   #   volumes:
   #     - C:\license:C:\license
   #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs

From 7271a253a6f695bb6c08cb10f21f7f5bb4188c8e Mon Sep 17 00:00:00 2001
From: Bart Plasmeijer <bart.plasmeijer@valtech.com>
Date: Tue, 22 Oct 2019 16:57:30 +0200
Subject: [PATCH 3/4] uncommented CDs from compose files

---
 windows/tests/9.x.x/docker-compose.jss.xm.yml | 20 ++++++++---------
 windows/tests/9.x.x/docker-compose.spe.xm.yml | 20 ++++++++---------
 windows/tests/9.x.x/docker-compose.sxa.xm.yml | 20 ++++++++---------
 windows/tests/9.x.x/docker-compose.sxa.xp.yml | 22 +++++++++----------
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/windows/tests/9.x.x/docker-compose.jss.xm.yml b/windows/tests/9.x.x/docker-compose.jss.xm.yml
index 2e6fc777b..d04322144 100644
--- a/windows/tests/9.x.x/docker-compose.jss.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.jss.xm.yml
@@ -18,16 +18,16 @@ services:
     ports:
       - "44011:8983"
 
-  # cd:
-  #   image: ${REGISTRY}sitecore-xm-jss-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
-  #   volumes:
-  #     - C:\license:C:\license
-  #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
-  #   ports:
-  #     - "44002:80"
-  #   links:
-  #     - sql
-  #     - solr
+  cd:
+    image: ${REGISTRY}sitecore-xm-jss-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - C:\license:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
 
   cm:
     image: ${REGISTRY}sitecore-xm-jss-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
diff --git a/windows/tests/9.x.x/docker-compose.spe.xm.yml b/windows/tests/9.x.x/docker-compose.spe.xm.yml
index f7ea64974..e7ffb71ed 100644
--- a/windows/tests/9.x.x/docker-compose.spe.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.spe.xm.yml
@@ -18,16 +18,16 @@ services:
     ports:
       - "44011:8983"
 
-  # cd:
-  #   image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
-  #   volumes:
-  #     - C:\license:C:\license
-  #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
-  #   ports:
-  #     - "44002:80"
-  #   links:
-  #     - sql
-  #     - solr
+  cd:
+    image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - C:\license:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
 
   cm:
     image: ${REGISTRY}sitecore-xm-spe-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
diff --git a/windows/tests/9.x.x/docker-compose.sxa.xm.yml b/windows/tests/9.x.x/docker-compose.sxa.xm.yml
index e4d178665..75ef66577 100644
--- a/windows/tests/9.x.x/docker-compose.sxa.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.sxa.xm.yml
@@ -18,16 +18,16 @@ services:
     ports:
       - "44011:8983"
 
-  # cd:
-  #   image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
-  #   volumes:
-  #     - C:\license:C:\license
-  #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
-  #   ports:
-  #     - "44002:80"
-  #   links:
-  #     - sql
-  #     - solr
+  cd:
+    image: ${REGISTRY}sitecore-xm-sxa-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - C:\license:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
 
   cm:
     image: ${REGISTRY}sitecore-xm-sxa-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
diff --git a/windows/tests/9.x.x/docker-compose.sxa.xp.yml b/windows/tests/9.x.x/docker-compose.sxa.xp.yml
index 2681fb3ec..1586bf9fe 100644
--- a/windows/tests/9.x.x/docker-compose.sxa.xp.yml
+++ b/windows/tests/9.x.x/docker-compose.sxa.xp.yml
@@ -48,17 +48,17 @@ services:
       - sql
       - solr
 
-  # cd:
-  #   image: ${REGISTRY}sitecore-xp-sxa-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
-  #   volumes:
-  #     - C:\license:C:\license
-  #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
-  #   ports:
-  #     - "44002:80"
-  #   links:
-  #     - sql
-  #     - solr
-  #     - xconnect
+  cd:
+    image: ${REGISTRY}sitecore-xp-sxa-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - C:\license:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
+      - xconnect
 
   cm:
     image: ${REGISTRY}sitecore-xp-sxa-standalone:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}

From 4f2f6e084e196aa3b4b6eab31fda4c5c33275108 Mon Sep 17 00:00:00 2001
From: Bart Plasmeijer <bart.plasmeijer@valtech.com>
Date: Tue, 22 Oct 2019 22:57:13 +0200
Subject: [PATCH 4/4] update to ${LICENSE_PATH}

---
 windows/tests/9.x.x/docker-compose.jss.xm.yml | 4 ++--
 windows/tests/9.x.x/docker-compose.spe.xm.yml | 4 ++--
 windows/tests/9.x.x/docker-compose.sxa.xm.yml | 4 ++--
 windows/tests/9.x.x/docker-compose.sxa.xp.yml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/windows/tests/9.x.x/docker-compose.jss.xm.yml b/windows/tests/9.x.x/docker-compose.jss.xm.yml
index d04322144..f28ba2722 100644
--- a/windows/tests/9.x.x/docker-compose.jss.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.jss.xm.yml
@@ -21,7 +21,7 @@ services:
   cd:
     image: ${REGISTRY}sitecore-xm-jss-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44002:80"
@@ -32,7 +32,7 @@ services:
   cm:
     image: ${REGISTRY}sitecore-xm-jss-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44001:80"
diff --git a/windows/tests/9.x.x/docker-compose.spe.xm.yml b/windows/tests/9.x.x/docker-compose.spe.xm.yml
index e7ffb71ed..dcbdf1437 100644
--- a/windows/tests/9.x.x/docker-compose.spe.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.spe.xm.yml
@@ -21,7 +21,7 @@ services:
   cd:
     image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44002:80"
@@ -32,7 +32,7 @@ services:
   cm:
     image: ${REGISTRY}sitecore-xm-spe-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44001:80"
diff --git a/windows/tests/9.x.x/docker-compose.sxa.xm.yml b/windows/tests/9.x.x/docker-compose.sxa.xm.yml
index 75ef66577..a4ff0862b 100644
--- a/windows/tests/9.x.x/docker-compose.sxa.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.sxa.xm.yml
@@ -21,7 +21,7 @@ services:
   cd:
     image: ${REGISTRY}sitecore-xm-sxa-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44002:80"
@@ -32,7 +32,7 @@ services:
   cm:
     image: ${REGISTRY}sitecore-xm-sxa-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
       - .\data\src:C:\src
     ports:
diff --git a/windows/tests/9.x.x/docker-compose.sxa.xp.yml b/windows/tests/9.x.x/docker-compose.sxa.xp.yml
index 1586bf9fe..70d4c4e96 100644
--- a/windows/tests/9.x.x/docker-compose.sxa.xp.yml
+++ b/windows/tests/9.x.x/docker-compose.sxa.xp.yml
@@ -51,7 +51,7 @@ services:
   cd:
     image: ${REGISTRY}sitecore-xp-sxa-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44002:80"
@@ -63,7 +63,7 @@ services:
   cm:
     image: ${REGISTRY}sitecore-xp-sxa-standalone:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44001:80"