Merge pull request #68 from sitecorelabs/main

Merge xmcloud-foundation-head-dev into xmcloud-foundation-head-staging

.env

@@ -22,7 +22,7 @@ SQL_SA_PASSWORD=Password123!
 SQL_DATABASE_PREFIX=Sitecore
 
 # Other supporting images, including Sitecore modules and Docker tools
-TOOLS_IMAGE=scr.sitecore.com/tools/sitecore-docker-tools-assets:10.2.0-1809
+TOOLS_IMAGE=scr.sitecore.com/tools/sitecore-xmcloud-docker-tools-assets
 TRAEFIK_IMAGE=traefik:v2.5.3-windowsservercore-1809
 
 # Windows and Node.js version for JSS

docker-compose.override.yml

@@ -68,7 +68,7 @@ services:
       context: ./docker/build/cm
       args:
         PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xmcloud-cm:${SITECORE_VERSION}
-        TOOLS_IMAGE: ${TOOLS_IMAGE}
+        TOOLS_IMAGE: ${TOOLS_IMAGE}:${SITECORE_VERSION}
     volumes:
       - ${LOCAL_DEPLOY_PATH}\platform:C:\deploy
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
@@ -85,4 +85,4 @@ services:
       ## Development Environment Optimizations
       SITECORE_DEVELOPMENT_PATCHES: DevEnvOn,CustomErrorsOff,DebugOn,DiagnosticsOff,InitMessagesOff
       Sitecore_AppSettings_exmEnabled:define: "no" # remove to turn on EXM
-    entrypoint: powershell -Command "& C:/tools/entrypoints/iis/Development.ps1"
+    entrypoint: powershell -Command "& C:/tools/entrypoints/iis/XmCloudDevelopment.ps1"

sitecore.json

@@ -8,7 +8,7 @@
     "[email protected]",
     "[email protected]",
     "[email protected]",
-    "[email protected].30"
+    "[email protected].73"
   ],
   "serialization": {
     "defaultMaxRelativeItemPathLength": 100,

up.ps1

@@ -10,6 +10,7 @@ $sitecoreDockerRegistry = $envContent | Where-Object { $_ -imatch "^SITECORE_DOC
 $sitecoreVersion = $envContent | Where-Object { $_ -imatch "^SITECORE_VERSION=.+" }
 $ClientCredentialsLogin = $envContent | Where-Object { $_ -imatch "^SITECORE_FedAuth_dot_Auth0_dot_ClientCredentialsLogin=.+" }
 $sitecoreApiKey = ($envContent | Where-Object { $_ -imatch "^SITECORE_API_KEY_xmcloudpreview=.+" }).Split("=")[1]
+$xmcloudDockerToolsImage = ($envContent | Where-Object { $_ -imatch "^TOOLS_IMAGE=.+" }).Split("=")[1]
 
 $xmCloudHost = $xmCloudHost.Split("=")[1]
 $sitecoreDockerRegistry = $sitecoreDockerRegistry.Split("=")[1]
@@ -43,6 +44,9 @@ if (-not $envCheck) {
 Write-Host "Keeping XM Cloud base image up to date" -ForegroundColor Green
 docker pull "$($sitecoreDockerRegistry)sitecore-xmcloud-cm:$($sitecoreVersion)"
 
+Write-Host "Keeping XM Cloud Tools image up to date" -ForegroundColor Green
+docker pull "$($xmcloudDockerToolsImage):$($sitecoreVersion)"
+
 # Build all containers in the Sitecore instance, forcing a pull of latest base containers
 Write-Host "Building containers..." -ForegroundColor Green
 docker compose build

xmcloud.build.json

@@ -6,8 +6,6 @@
         "jssDeploymentSecret": "110F1C44A496B45478640DD36F80C18C9",
         "enabled": true,
         "type": "sxa",
-        "lintCommand": "lint",
-        "startCommand": "start:production",
         "buildCommand": "build",
         "runCommand": "next:start"
       }