Merge pull request #32 from Sitecore/develop

Release for Sitecore XP 10.1
Sitecore · Feb 25, 2021 · 25aa2b3 · 25aa2b3
2 parents 5a9415d + 870483f
commit 25aa2b3
Show file tree

Hide file tree

Showing 20 changed files with 198 additions and 127 deletions.
diff --git a/custom-images/.env b/custom-images/.env
@@ -16,10 +16,10 @@ ID_HOST=id.dockerexamples.localhost
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
 SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
 SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/
-SITECORE_VERSION=10.0-ltsc2019
-TOOLS_VERSION=10.0.0-1809
-SPE_VERSION=6.1.1-1809
-SXA_VERSION=10.0.0-1809
+SITECORE_VERSION=10.1-ltsc2019
+TOOLS_VERSION=10.1-1809
+SPE_VERSION=6.2-1809
+SXA_VERSION=10.1-1809
 
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
@@ -32,4 +32,5 @@ SITECORE_LICENSE=
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
-SOLR_CORE_PREFIX_NAME=sitecore
+SOLR_CORE_PREFIX_NAME=sitecore
+MEDIA_REQUEST_PROTECTION_SHARED_SECRET=
diff --git a/custom-images/Directory.Build.targets b/custom-images/Directory.Build.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.46" />
+  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.79" />
 </Project>
diff --git a/custom-images/Dockerfile b/custom-images/Dockerfile
@@ -4,6 +4,7 @@ ARG BASE_IMAGE
 ARG BUILD_IMAGE
 
 FROM ${BUILD_IMAGE} AS prep
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 # Gather only artifacts necessary for NuGet restore, retaining directory structure
 COPY *.sln nuget.config Directory.Build.targets Packages.props \nuget\

diff --git a/custom-images/Packages.props b/custom-images/Packages.props
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PlatformVersion>10.0.1</PlatformVersion>
+    <PlatformVersion>10.1.0</PlatformVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Update="Sitecore.XConnect" Version="$(PlatformVersion)" />
     <PackageReference Update="Sitecore.XConnect.Client" Version="$(PlatformVersion)" />
     <PackageReference Update="Sitecore.XConnect.Collection.Model" Version="$(PlatformVersion)" />
+    <PackageReference Update="Sitecore.Assemblies.Platform" Version="$(PlatformVersion)" />
     <PackageReference Update="Sitecore.Assemblies.XConnect.Web" Version="$(PlatformVersion)" />
   </ItemGroup>
 </Project>
diff --git a/custom-images/docker-compose.override.yml b/custom-images/docker-compose.override.yml
@@ -28,16 +28,19 @@ services:
     volumes:
       - ${LOCAL_DATA_PATH}\mssql:c:\data
 
+  # Mount our Solr data folder
   solr:
-    image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp0-solr:${VERSION:-latest}
+    volumes:
+      - ${LOCAL_DATA_PATH}\solr:c:\data
+
+  # Some modules (like SXA) also require additions to the Solr image.
+  solr-init:
+    image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp0-solr-init:${VERSION:-latest}
     build:
-      context: ./docker/build/solr
+      context: ./docker/build/solr-init
       args:
-        BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp0-solr:${SITECORE_VERSION}
+        BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp0-solr-init:${SITECORE_VERSION}
         SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sxa-xp1-assets:${SXA_VERSION}
-    mem_limit: 1GB
-    volumes:
-      - ${LOCAL_DATA_PATH}\solr:c:\data
 
   id:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
@@ -61,6 +64,8 @@ services:
     volumes:
       - ${LOCAL_DEPLOY_PATH}\website:C:\deploy
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
+    environment:
+      SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
 
   xconnect:

diff --git a/custom-images/docker-compose.xm1.override.yml b/custom-images/docker-compose.xm1.override.yml
@@ -35,16 +35,19 @@ services:
     volumes:
       - ${LOCAL_DATA_PATH}\mssql:c:\data
 
+  # Mount our Solr data folder
   solr:
-    image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-solr:${VERSION:-latest}
+    volumes:
+      - ${LOCAL_DATA_PATH}\solr:c:\data
+
+  # Some modules (like SXA) also require additions to the Solr image.
+  solr-init:
+    image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-solr-init:${VERSION:-latest}
     build:
-      context: ./docker/build/solr
+      context: ./docker/build/solr-init
       args:
-        BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr:${SITECORE_VERSION}
+        BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr-init:${SITECORE_VERSION}
         SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sxa-xm1-assets:${SXA_VERSION}
-    mem_limit: 1GB
-    volumes:
-      - ${LOCAL_DATA_PATH}\solr:c:\data
 
   id:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
@@ -67,6 +70,8 @@ services:
     volumes:
       - ${LOCAL_DEPLOY_PATH}\website:C:\deploy
       - ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
+    environment:
+      SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
 
   cm:
@@ -84,4 +89,6 @@ services:
     volumes:
       - ${LOCAL_DEPLOY_PATH}\website:C:\deploy
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
+    environment:
+      SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
diff --git a/custom-images/docker-compose.xm1.yml b/custom-images/docker-compose.xm1.yml
@@ -45,13 +45,24 @@ services:
         target: c:\data
   solr:
     isolation: ${ISOLATION}
+    image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION}
     ports:
       - "8984:8983"
-    image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr:${SITECORE_VERSION}
     volumes:
       - type: bind
         source: .\solr-data
         target: c:\data
+    environment:
+      SOLR_MODE: solrcloud
+  solr-init:
+    isolation: ${ISOLATION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr-init:${SITECORE_VERSION}
+    environment:
+      SITECORE_SOLR_CONNECTION_STRING: http://solr:8983/solr
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
+    depends_on:
+      solr:
+        condition: service_healthy
   id:
     isolation: ${ISOLATION}
     image: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
@@ -81,7 +92,7 @@ services:
     depends_on:
       mssql:
         condition: service_healthy
-      solr:
+      solr-init:
         condition: service_started
       redis:
         condition: service_started
@@ -90,10 +101,11 @@ services:
       Sitecore_ConnectionStrings_Security: Data Source=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Web: Data Source=mssql;Initial Catalog=Sitecore.Web;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_ExperienceForms: Data Source=mssql;Initial Catalog=Sitecore.ExperienceForms;User ID=sa;Password=${SQL_SA_PASSWORD}
-      Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr
+      Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr;solrCloud=true
       Sitecore_ConnectionStrings_Redis.Sessions: redis:6379,ssl=False,abortConnect=False
       Sitecore_License: ${SITECORE_LICENSE}
       SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
+      MEDIA_REQUEST_PROTECTION_SHARED_SECRET: ${MEDIA_REQUEST_PROTECTION_SHARED_SECRET}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
@@ -108,7 +120,7 @@ services:
     depends_on:
       mssql:
         condition: service_healthy
-      solr:
+      solr-init:
         condition: service_started
       id:
         condition: service_started
@@ -119,7 +131,7 @@ services:
       Sitecore_ConnectionStrings_Master: Data Source=mssql;Initial Catalog=Sitecore.Master;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Web: Data Source=mssql;Initial Catalog=Sitecore.Web;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_ExperienceForms: Data Source=mssql;Initial Catalog=Sitecore.ExperienceForms;User ID=sa;Password=${SQL_SA_PASSWORD}
-      Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr
+      Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr;solrCloud=true
       Sitecore_ConnectionStrings_Sitecoreidentity.secret: ${SITECORE_IDSECRET}
       Sitecore_AppSettings_Telerik.AsyncUpload.ConfigurationEncryptionKey: ${TELERIK_ENCRYPTION_KEY}
       Sitecore_AppSettings_Telerik.Upload.ConfigurationHashKey: ${TELERIK_ENCRYPTION_KEY}
@@ -130,6 +142,7 @@ services:
       Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
       Sitecore_Identity_Server_Require_Https: "false"
       SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
+      MEDIA_REQUEST_PROTECTION_SHARED_SECRET: ${MEDIA_REQUEST_PROTECTION_SHARED_SECRET}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s

diff --git a/custom-images/docker-compose.xp1.override.yml b/custom-images/docker-compose.xp1.override.yml
@@ -35,16 +35,19 @@ services:
     volumes:
       - ${LOCAL_DATA_PATH}\mssql:c:\data
 
+  # Mount our Solr data folder
   solr:
-    image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-solr:${VERSION:-latest}
+    volumes:
+      - ${LOCAL_DATA_PATH}\solr:c:\data
+
+  # Some modules (like SXA) also require additions to the Solr image.
+  solr-init:
+    image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-solr-init:${VERSION:-latest}
     build:
-      context: ./docker/build/solr
+      context: ./docker/build/solr-init
       args:
-        BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-solr:${SITECORE_VERSION}
+        BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-solr-init:${SITECORE_VERSION}
         SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sxa-xp1-assets:${SXA_VERSION}
-    mem_limit: 1GB
-    volumes:
-      - ${LOCAL_DATA_PATH}\solr:c:\data
 
   id:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
@@ -67,6 +70,8 @@ services:
     volumes:
       - ${LOCAL_DEPLOY_PATH}\website:C:\deploy
       - ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
+    environment:
+      SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
 
   cm:
@@ -84,6 +89,8 @@ services:
     volumes:
       - ${LOCAL_DEPLOY_PATH}\website:C:\deploy
       - ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
+    environment:
+      SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
 
   prc:
@@ -96,16 +103,6 @@ services:
     depends_on:
       - solution
 
-  rep:
-    image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-rep:${VERSION:-latest}
-    build:
-      context: ./docker/build/rep
-      args:
-        BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-rep:${SITECORE_VERSION}
-        SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
-    depends_on:
-      - solution
-
   xdbcollection:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-xdbcollection:${VERSION:-latest}
     build: