Add SXC Sitecore Commerce Container SDK 10.2.0.80218.30249

Sitecore · Sep 11, 2023 · b93a03f · b93a03f
1 parent 878e13b
commit b93a03f
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/sxc/10.2/k8s-commerce-xc1/kustomization.yaml b/sxc/10.2/k8s-commerce-xc1/kustomization.yaml
@@ -15,7 +15,7 @@ images:
   newName: {registry}/{sxc-nonproduction-project}/sitecore-xc1-cm
   newTag: {commerce-version}
 - name: sitecore-xc-id
-  newName: {registry}/{sxc-nonproduction-project}/sitecore-xc-id6
+  newName: {registry}/{sxc-nonproduction-project}/sitecore-xc-id7
   newTag: {commerce-version}
 - name: sitecore-xp1-cortexprocessing
   newName: {registry}/{project}/sitecore-xp1-cortexprocessing

diff --git a/sxc/10.2/scripts/ComposeInit.ps1 b/sxc/10.2/scripts/ComposeInit.ps1
@@ -336,11 +336,12 @@ if (-not (Test-Path $LicenseXmlPath -PathType Leaf)) {
 
 # Check for Sitecore Gallery
 Import-Module PowerShellGet
-$SitecoreGallery = Get-PSRepository | Where-Object { $_.SourceLocation -eq $SitecoreGalleryRepositoryLocation }
+$SitecoreGalleryName = 'SitecoreGallery'
+$SitecoreGallery = Get-PSRepository | Where-Object { $_.Name -eq $SitecoreGalleryName }
 if (-not $SitecoreGallery) { 
     Write-Host "Adding Sitecore PowerShell Gallery..." -ForegroundColor Green 
-    Register-PSRepository -Name SitecoreGallery -SourceLocation $SitecoreGalleryRepositoryLocation -InstallationPolicy Trusted
-    $SitecoreGallery = Get-PSRepository -Name SitecoreGallery
+    Register-PSRepository -Name $SitecoreGalleryName -SourceLocation $SitecoreGalleryRepositoryLocation -InstallationPolicy Trusted
+    $SitecoreGallery = Get-PSRepository -Name $SitecoreGalleryName
 }
 
 # Install and Import SitecoreDockerTools

diff --git a/sxc/10.2/scripts/ContainerBuild.ps1 b/sxc/10.2/scripts/ContainerBuild.ps1
@@ -28,8 +28,8 @@ Get-ChildItem -Path "$envRootPath" -Include 'docker-compose.build.yml' -Recurse
         Push-Location -Path $workingDir
 
         '[Building containers for] {0}' -f $PWD
-        Write-Host "docker-compose --no-ansi --file (Join-Path $workingDir 'docker-compose.build.yml') build --parallel"
-        & docker-compose --no-ansi -f (Join-Path $workingDir 'docker-compose.build.yml') build --parallel
+        Write-Host "docker-compose --ansi never --env-file build.env --file (Join-Path $workingDir 'docker-compose.build.yml') build"
+        & docker-compose --ansi never --env-file build.env -f (Join-Path $workingDir 'docker-compose.build.yml') build
 
         if ($LASTEXITCODE -gt 0) {
             Throw "Error in docker-compose build."

diff --git a/sxc/10.2/xc-common/docker-compose.build.yml b/sxc/10.2/xc-common/docker-compose.build.yml
@@ -4,9 +4,9 @@ services:
       isolation: ${ISOLATION}
       context: ./id
       args:
-        BASE_IMAGE: ${XP_SITECORE_DOCKER_REGISTRY}sitecore-id6:${XP_SITECORE_TAG}
+        BASE_IMAGE: ${XP_SITECORE_DOCKER_REGISTRY}sitecore-id7:${XP_SITECORE_TAG}
         ASSETS_IMAGE: ${XC_SITECORE_DOCKER_REGISTRY}sitecore-xc0-assets:${XC_PACKAGES_TAG}               
-    image: sitecore-xc-id6
+    image: sitecore-xc-id7
   bizfx:
     build:
       isolation: ${ISOLATION}

diff --git a/sxc/10.2/xc0/.env b/sxc/10.2/xc0/.env
@@ -7,7 +7,7 @@ XC_NONPRODUCTION_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxc/nonproduction/
 XC_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxc/
 XC_PACKAGES_TAG=10.2-ltsc2019
 
-TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
+TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 
 ISOLATION=default

diff --git a/sxc/10.2/xc0/docker-compose.yml b/sxc/10.2/xc0/docker-compose.yml
@@ -93,7 +93,7 @@ services:
       restart: unless-stopped
   id:
     isolation: ${ISOLATION}
-    image: ${XC_NONPRODUCTION_SITECORE_DOCKER_REGISTRY}sitecore-xc-id6:${XC_PACKAGES_TAG}
+    image: ${XC_NONPRODUCTION_SITECORE_DOCKER_REGISTRY}sitecore-xc-id7:${XC_PACKAGES_TAG}
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=Sitecore.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1

diff --git a/sxc/10.2/xc1-cxa/.env b/sxc/10.2/xc1-cxa/.env
@@ -11,7 +11,7 @@ XC_NONPRODUCTION_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxc/nonproduction/
 XC_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxc/
 XC_PACKAGES_TAG=10.2-ltsc2019
 
-TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
+TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 
 ISOLATION=default

diff --git a/sxc/10.2/xc1-cxa/docker-compose.yml b/sxc/10.2/xc1-cxa/docker-compose.yml
@@ -98,7 +98,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${XC_NONPRODUCTION_SITECORE_DOCKER_REGISTRY}sitecore-xc-id6:${XC_PACKAGES_TAG}
+    image: ${XC_NONPRODUCTION_SITECORE_DOCKER_REGISTRY}sitecore-xc-id7:${XC_PACKAGES_TAG}
     restart: unless-stopped
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=Sitecore.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}