Add SXC Sitecore Commerce Container SDK 10.1.0.70162.20180

Sitecore · Sep 18, 2023 · bf62d2b · bf62d2b
1 parent 26036f4
commit bf62d2b
Show file tree

Hide file tree

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

diff --git a/sxc/10.1/scripts/ContainerBuild.ps1 b/sxc/10.1/scripts/ContainerBuild.ps1
@@ -26,7 +26,7 @@ $xcResourcesPath = Join-Path "$envRootPath" "xc-resources"
 Push-Location -Path $xcResourcesPath
 $xcResourceYml = Join-Path $xcResourcesPath 'docker-compose.build.yml'
 Write-Host "Building resource container image: $xcResourceYml"
-& docker-compose --no-ansi -f ($xcResourceYml) build --parallel
+& docker-compose --ansi never -f ($xcResourceYml) build
 Pop-Location
 
 Get-ChildItem -Path "$envRootPath" -Include 'docker-compose.build.yml' -Recurse |
@@ -49,8 +49,8 @@ Get-ChildItem -Path "$envRootPath" -Include 'docker-compose.build.yml' -Recurse
             Copy-Item -Path '.\commerce.build.yml' -Destination '.\docker-compose.build.yml' -Force -Verbose
         }
         '[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 --file (Join-Path $workingDir 'docker-compose.build.yml') build"
+        & docker-compose --ansi never -f (Join-Path $workingDir 'docker-compose.build.yml') build
 
         if ($LASTEXITCODE -gt 0) {
             Throw "Error in docker-compose build."

diff --git a/sxc/10.1/xc-common/docker-compose.build.yml b/sxc/10.1/xc-common/docker-compose.build.yml
@@ -5,8 +5,8 @@ services:
       isolation: ${ISOLATION}
       context: ./id
       args:
-        BASE_IMAGE: ${XP_SITECORE_DOCKER_REGISTRY}sitecore-id6:${XP_SITECORE_TAG}
-    image: sitecore-xc-id6
+        BASE_IMAGE: ${XP_SITECORE_DOCKER_REGISTRY}sitecore-id7:${XP_SITECORE_TAG}
+    image: sitecore-xc-id7
   bizfx:
     build:
       isolation: ${ISOLATION}

diff --git a/sxc/10.1/xc0/.env b/sxc/10.1/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.1-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.1/xc0/docker-compose.yml b/sxc/10.1/xc0/docker-compose.yml
@@ -74,7 +74,7 @@ services:
       restart: unless-stopped
   id:
     isolation: ${ISOLATION}
-    image: ${XC_SITECORE_DOCKER_REGISTRY}sitecore-xc-id6:${XC_PACKAGES_TAG}
+    image: ${XC_SITECORE_DOCKER_REGISTRY}sitecore-xc-id7:${XC_PACKAGES_TAG}
     depends_on:
       mssql:
         condition: service_healthy
@@ -92,7 +92,7 @@ services:
       Sitecore_Sitecore__IdentityServer__Clients__CommerceEngineConnectClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1: https://${CM_HOST}
       Sitecore_Sitecore__IdentityServer__Clients__CommerceEngineConnectClient__ClientSecrets__ClientSecret1: ${XC_IDENTITY_COMMERCEENGINECONNECTCLIENT_CLIENTSECRET1}
     healthcheck:
-      test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
+      test: ["CMD", "pwsh", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     labels:
       - "traefik.enable=true"

diff --git a/sxc/10.1/xc1-cxa/.env b/sxc/10.1/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.1-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.1/xc1-cxa/docker-compose.yml b/sxc/10.1/xc1-cxa/docker-compose.yml
@@ -79,7 +79,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${XC_SITECORE_DOCKER_REGISTRY}sitecore-xc-id6:${XC_PACKAGES_TAG}
+    image: ${XC_SITECORE_DOCKER_REGISTRY}sitecore-xc-id7:${XC_PACKAGES_TAG}
     depends_on:
       mssql:
         condition: service_healthy
@@ -98,7 +98,7 @@ services:
       Sitecore_Sitecore__IdentityServer__Clients__CommerceEngineConnectClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1: https://${CD_HOST}|https://${CM_HOST}
       Sitecore_Sitecore__IdentityServer__Clients__CommerceEngineConnectClient__ClientSecrets__ClientSecret1: ${XC_IDENTITY_COMMERCEENGINECONNECTCLIENT_CLIENTSECRET1}
     healthcheck:
-      test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
+      test: ["CMD", "pwsh", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     labels:
       - "traefik.enable=true"