Add SXP Sitecore Container Deployment 10.0.1.004842.221 (#4)

Sitecore · Dec 17, 2020 · f4da18d · f4da18d
1 parent 1414329
commit f4da18d
Show file tree

Hide file tree

Showing 99 changed files with 554 additions and 73 deletions.
diff --git a/compose/sxp/10.0/2004/upgrade/xm1/docker-compose.upgrade.yml b/compose/sxp/10.0/2004/upgrade/xm1/docker-compose.upgrade.yml
@@ -0,0 +1,10 @@
+version: "2.4"
+services:
+  mssql-upgrade:
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-mssql-upgrade:${SITECORE_VERSION}
+    environment:
+      Sitecore_ConnectionStrings_Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Experienceforms: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Experienceforms;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_License: ${SITECORE_LICENSE}
+    isolation: ${ISOLATION}
diff --git a/compose/sxp/10.0/2004/upgrade/xm1/upgrade.env b/compose/sxp/10.0/2004/upgrade/xm1/upgrade.env
@@ -0,0 +1,9 @@
+COMPOSE_PROJECT_NAME=sitecore-xm1
+SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
+SITECORE_VERSION=10.0-2004
+SQL_DATABASE_PREFIX=Sitecore
+SQL_SERVER=
+SQL_USERNAME=
+SQL_PASSWORD=
+SITECORE_LICENSE=
+ISOLATION=default
diff --git a/compose/sxp/10.0/2004/upgrade/xp1/docker-compose.upgrade.yml b/compose/sxp/10.0/2004/upgrade/xp1/docker-compose.upgrade.yml
@@ -0,0 +1,15 @@
+version: "2.4"
+services:
+  mssql-upgrade:
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-mssql-upgrade:${SITECORE_VERSION}
+    environment:
+      IS_ALWAYS_ENCRYPTED: ${IS_ALWAYS_ENCRYPTED}
+      Sitecore_ConnectionStrings_Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Experienceforms: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Experienceforms;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Reporting: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Reporting;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Marketingautomation: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Marketingautomation;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Xdb_Collection_Shard0: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Xdb.Collection.Shard0;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Xdb_Collection_Shard1: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Xdb.Collection.Shard1;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_License: ${SITECORE_LICENSE}
+    isolation: ${ISOLATION}
diff --git a/compose/sxp/10.0/2004/upgrade/xp1/upgrade.env b/compose/sxp/10.0/2004/upgrade/xp1/upgrade.env
@@ -0,0 +1,10 @@
+COMPOSE_PROJECT_NAME=sitecore-xp1
+SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
+SITECORE_VERSION=10.0-2004
+SQL_DATABASE_PREFIX=Sitecore
+SQL_SERVER=
+SQL_USERNAME=
+SQL_PASSWORD=
+IS_ALWAYS_ENCRYPTED=
+SITECORE_LICENSE=
+ISOLATION=default
diff --git a/compose/sxp/10.0/2004/xm1/.env b/compose/sxp/10.0/2004/xm1/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=sitecore-xm1
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-SITECORE_VERSION=10.0.0-2004
+SITECORE_VERSION=10.0-2004
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
 TELERIK_ENCRYPTION_KEY=
@@ -14,3 +14,4 @@ ID_HOST=xm1id.localhost
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
+SOLR_CORE_PREFIX_NAME=sitecore
diff --git a/compose/sxp/10.0/2004/xm1/docker-compose.yml b/compose/sxp/10.0/2004/xm1/docker-compose.yml
@@ -9,10 +9,8 @@ services:
       - "--providers.docker.endpoint=npipe:////./pipe/docker_engine"
       - "--providers.docker.exposedByDefault=false"
       - "--providers.file.directory=C:/etc/traefik/config/dynamic"
-      - "--entryPoints.web.address=:80"
       - "--entryPoints.websecure.address=:443"
     ports:
-      - "8080:80"
       - "443:443"
       - "8079:8080"
     healthcheck:
@@ -95,13 +93,15 @@ services:
       Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr
       Sitecore_ConnectionStrings_Redis.Sessions: redis:6379,ssl=False,abortConnect=False
       Sitecore_License: ${SITECORE_LICENSE}
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.cd.entrypoints=web"
-      - "traefik.http.routers.cd.rule=Host(`${CD_HOST}`)"
+      - "traefik.http.routers.cd-secure.entrypoints=websecure"
+      - "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
+      - "traefik.http.routers.cd-secure.tls=true"
   cm:
     isolation: ${ISOLATION}
     image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
@@ -129,6 +129,7 @@ services:
       Sitecore_Identity_Server_InternalAuthority: http://id
       Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
       Sitecore_Identity_Server_Require_Https: "false"
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s

diff --git a/compose/sxp/10.0/2004/xm1/traefik/certs/readme b/compose/sxp/10.0/2004/xm1/traefik/certs/readme
@@ -1,4 +1,6 @@
-Add TLS certificates for xm1cm.localhost and xm1id.localhost hosts to this folder:
+Add TLS certificates for xm1cd.localhost, xm1cm.localhost and xm1id.localhost hosts to this folder:
+    xm1cd.localhost.crt
+    xm1cd.localhost.key
     xm1cm.localhost.crt
     xm1cm.localhost.key
     xm1id.localhost.crt

diff --git a/compose/sxp/10.0/2004/xm1/traefik/config/dynamic/certs_config.yaml b/compose/sxp/10.0/2004/xm1/traefik/config/dynamic/certs_config.yaml
@@ -1,5 +1,7 @@
 tls:
   certificates:
+    - certFile: C:\etc\traefik\certs\xm1cd.localhost.crt
+      keyFile: C:\etc\traefik\certs\xm1cd.localhost.key
     - certFile: C:\etc\traefik\certs\xm1cm.localhost.crt
       keyFile: C:\etc\traefik\certs\xm1cm.localhost.key
     - certFile: C:\etc\traefik\certs\xm1id.localhost.crt

diff --git a/compose/sxp/10.0/2004/xp0/.env b/compose/sxp/10.0/2004/xp0/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=sitecore-xp0
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-SITECORE_VERSION=10.0.0-2004
+SITECORE_VERSION=10.0-2004
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
 TELERIK_ENCRYPTION_KEY=
@@ -13,3 +13,4 @@ ID_HOST=xp0id.localhost
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
+SOLR_CORE_PREFIX_NAME=sitecore
diff --git a/compose/sxp/10.0/2004/xp0/docker-compose.yml b/compose/sxp/10.0/2004/xp0/docker-compose.yml
@@ -103,6 +103,7 @@ services:
       Sitecore_Identity_Server_InternalAuthority: http://id
       Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
       Sitecore_Identity_Server_Require_Https: "false"
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s

diff --git a/compose/sxp/10.0/2004/xp1/.env b/compose/sxp/10.0/2004/xp1/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=sitecore-xp1
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-SITECORE_VERSION=10.0.0-2004
+SITECORE_VERSION=10.0-2004
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
 REPORTING_API_KEY=
@@ -15,3 +15,4 @@ ID_HOST=xp1id.localhost
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
+SOLR_CORE_PREFIX_NAME=sitecore
diff --git a/compose/sxp/10.0/2004/xp1/docker-compose.yml b/compose/sxp/10.0/2004/xp1/docker-compose.yml
@@ -9,10 +9,8 @@ services:
       - "--providers.docker.endpoint=npipe:////./pipe/docker_engine"
       - "--providers.docker.exposedByDefault=false"
       - "--providers.file.directory=C:/etc/traefik/config/dynamic"
-      - "--entryPoints.web.address=:80"
       - "--entryPoints.websecure.address=:443"
     ports:
-      - "8080:80"
       - "443:443"
       - "8079:8080"
     healthcheck:
@@ -110,13 +108,15 @@ services:
       Sitecore_ConnectionStrings_Xdb.ReferenceData.Client: http://xdbrefdata
       Sitecore_ConnectionStrings_Redis.Sessions: redis:6379,ssl=False,abortConnect=False
       Sitecore_License: ${SITECORE_LICENSE}
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.cd.entrypoints=web"
-      - "traefik.http.routers.cd.rule=Host(`${CD_HOST}`)"      
+      - "traefik.http.routers.cd-secure.entrypoints=websecure"
+      - "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
+      - "traefik.http.routers.cd-secure.tls=true"
   cm:
     isolation: ${ISOLATION}
     image: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-cm:${SITECORE_VERSION}
@@ -166,6 +166,7 @@ services:
       Sitecore_Identity_Server_InternalAuthority: http://id
       Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
       Sitecore_Identity_Server_Require_Https: "false"
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
@@ -245,7 +246,7 @@ services:
       Sitecore_ConnectionStrings_Xdb.Marketingautomation: Data Source=mssql;Initial Catalog=Sitecore.Marketingautomation;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Xdb.Processing.Pools: Data Source=mssql;Initial Catalog=Sitecore.Processing.pools;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Collection: Data Source=mssql;Initial Catalog=Sitecore.Xdb.Collection.ShardMapManager;User ID=sa;Password=${SQL_SA_PASSWORD}
-      Sitecore_ConnectionStrings_SolrCore: http://solr:8983/solr/sitecore_xdb
+      Sitecore_ConnectionStrings_SolrCore: http://solr:8983/solr/${SOLR_CORE_PREFIX_NAME}_xdb
       Sitecore_License: ${SITECORE_LICENSE}
       Sitecore_Sitecore:XConnect:CollectionSearch:Services:Solr.SolrReaderSettings:Options:RequireHttps: 'false'
       Sitecore_Sitecore:XConnect:CollectionSearch:Services:XConnectSolrHealthCheckServicesConfiguration:Options:RequireHttps: 'false'
@@ -330,7 +331,7 @@ services:
     restart: unless-stopped
     environment:
       Sitecore_ConnectionStrings_Collection: Data Source=mssql;Initial Catalog=Sitecore.Xdb.Collection.ShardMapManager;User ID=sa;Password=${SQL_SA_PASSWORD}
-      Sitecore_ConnectionStrings_SolrCore: http://solr:8983/solr/sitecore_xdb
+      Sitecore_ConnectionStrings_SolrCore: http://solr:8983/solr/${SOLR_CORE_PREFIX_NAME}_xdb
       Sitecore_License: ${SITECORE_LICENSE}
       Sitecore_Sitecore:XConnect:SearchIndexer:Services:Solr.SolrReaderSettings:Options:RequireHttps: 'false'
       Sitecore_Sitecore:XConnect:SearchIndexer:Services:Solr.SolrWriterSettings:Options:RequireHttps: 'false'

diff --git a/compose/sxp/10.0/2004/xp1/traefik/certs/readme b/compose/sxp/10.0/2004/xp1/traefik/certs/readme
@@ -1,4 +1,6 @@
-Add TLS certificates for xp1cm.localhost and xp1id.localhost hosts to this folder:
+Add TLS certificates for xp1cd.localhost, xp1cm.localhost and xp1id.localhost hosts to this folder:
+    xp1cd.localhost.crt
+    xp1cd.localhost.key
     xp1cm.localhost.crt
     xp1cm.localhost.key
     xp1id.localhost.crt

diff --git a/compose/sxp/10.0/2004/xp1/traefik/config/dynamic/certs_config.yaml b/compose/sxp/10.0/2004/xp1/traefik/config/dynamic/certs_config.yaml
@@ -1,5 +1,7 @@
 tls:
   certificates:
+    - certFile: C:\etc\traefik\certs\xp1cd.localhost.crt
+      keyFile: C:\etc\traefik\certs\xp1cd.localhost.key
     - certFile: C:\etc\traefik\certs\xp1cm.localhost.crt
       keyFile: C:\etc\traefik\certs\xp1cm.localhost.key
     - certFile: C:\etc\traefik\certs\xp1id.localhost.crt

diff --git a/compose/sxp/10.0/2009/upgrade/xm1/docker-compose.upgrade.yml b/compose/sxp/10.0/2009/upgrade/xm1/docker-compose.upgrade.yml
@@ -0,0 +1,10 @@
+version: "2.4"
+services:
+  mssql-upgrade:
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-mssql-upgrade:${SITECORE_VERSION}
+    environment:
+      Sitecore_ConnectionStrings_Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Experienceforms: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Experienceforms;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_License: ${SITECORE_LICENSE}
+    isolation: ${ISOLATION}
diff --git a/compose/sxp/10.0/2009/upgrade/xm1/upgrade.env b/compose/sxp/10.0/2009/upgrade/xm1/upgrade.env
@@ -0,0 +1,9 @@
+COMPOSE_PROJECT_NAME=sitecore-xm1
+SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
+SITECORE_VERSION=10.0-2009
+SQL_DATABASE_PREFIX=Sitecore
+SQL_SERVER=
+SQL_USERNAME=
+SQL_PASSWORD=
+SITECORE_LICENSE=
+ISOLATION=default
diff --git a/compose/sxp/10.0/2009/upgrade/xp1/docker-compose.upgrade.yml b/compose/sxp/10.0/2009/upgrade/xp1/docker-compose.upgrade.yml
@@ -0,0 +1,15 @@
+version: "2.4"
+services:
+  mssql-upgrade:
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-mssql-upgrade:${SITECORE_VERSION}
+    environment:
+      IS_ALWAYS_ENCRYPTED: ${IS_ALWAYS_ENCRYPTED}
+      Sitecore_ConnectionStrings_Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Experienceforms: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Experienceforms;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Reporting: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Reporting;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Marketingautomation: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Marketingautomation;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Xdb_Collection_Shard0: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Xdb.Collection.Shard0;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_ConnectionStrings_Xdb_Collection_Shard1: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Xdb.Collection.Shard1;User ID=${SQL_USERNAME};Password=${SQL_PASSWORD}
+      Sitecore_License: ${SITECORE_LICENSE}
+    isolation: ${ISOLATION}
diff --git a/compose/sxp/10.0/2009/upgrade/xp1/upgrade.env b/compose/sxp/10.0/2009/upgrade/xp1/upgrade.env
@@ -0,0 +1,10 @@
+COMPOSE_PROJECT_NAME=sitecore-xp1
+SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
+SITECORE_VERSION=10.0-2009
+SQL_DATABASE_PREFIX=Sitecore
+SQL_SERVER=
+SQL_USERNAME=
+SQL_PASSWORD=
+IS_ALWAYS_ENCRYPTED=
+SITECORE_LICENSE=
+ISOLATION=default
diff --git a/compose/sxp/10.0/2009/xm1/.env b/compose/sxp/10.0/2009/xm1/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=sitecore-xm1
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-SITECORE_VERSION=10.0.0-2009
+SITECORE_VERSION=10.0-2009
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
 TELERIK_ENCRYPTION_KEY=
@@ -14,3 +14,4 @@ ID_HOST=xm1id.localhost
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
+SOLR_CORE_PREFIX_NAME=sitecore
diff --git a/compose/sxp/10.0/2009/xm1/docker-compose.yml b/compose/sxp/10.0/2009/xm1/docker-compose.yml
@@ -9,10 +9,8 @@ services:
       - "--providers.docker.endpoint=npipe:////./pipe/docker_engine"
       - "--providers.docker.exposedByDefault=false"
       - "--providers.file.directory=C:/etc/traefik/config/dynamic"
-      - "--entryPoints.web.address=:80"
       - "--entryPoints.websecure.address=:443"
     ports:
-      - "8080:80"
       - "443:443"
       - "8079:8080"
     healthcheck:
@@ -95,13 +93,15 @@ services:
       Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr
       Sitecore_ConnectionStrings_Redis.Sessions: redis:6379,ssl=False,abortConnect=False
       Sitecore_License: ${SITECORE_LICENSE}
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.cd.entrypoints=web"
-      - "traefik.http.routers.cd.rule=Host(`${CD_HOST}`)"
+      - "traefik.http.routers.cd-secure.entrypoints=websecure"
+      - "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
+      - "traefik.http.routers.cd-secure.tls=true"
   cm:
     isolation: ${ISOLATION}
     image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
@@ -129,6 +129,7 @@ services:
       Sitecore_Identity_Server_InternalAuthority: http://id
       Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
       Sitecore_Identity_Server_Require_Https: "false"
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s

diff --git a/compose/sxp/10.0/2009/xm1/traefik/certs/readme b/compose/sxp/10.0/2009/xm1/traefik/certs/readme
@@ -1,4 +1,6 @@
-Add TLS certificates for xm1cm.localhost and xm1id.localhost hosts to this folder:
+Add TLS certificates for xm1cd.localhost, xm1cm.localhost and xm1id.localhost hosts to this folder:
+    xm1cd.localhost.crt
+    xm1cd.localhost.key
     xm1cm.localhost.crt
     xm1cm.localhost.key
     xm1id.localhost.crt

diff --git a/compose/sxp/10.0/2009/xm1/traefik/config/dynamic/certs_config.yaml b/compose/sxp/10.0/2009/xm1/traefik/config/dynamic/certs_config.yaml
@@ -1,5 +1,7 @@
 tls:
   certificates:
+    - certFile: C:\etc\traefik\certs\xm1cd.localhost.crt
+      keyFile: C:\etc\traefik\certs\xm1cd.localhost.key
     - certFile: C:\etc\traefik\certs\xm1cm.localhost.crt
       keyFile: C:\etc\traefik\certs\xm1cm.localhost.key
     - certFile: C:\etc\traefik\certs\xm1id.localhost.crt

diff --git a/compose/sxp/10.0/2009/xp0/.env b/compose/sxp/10.0/2009/xp0/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=sitecore-xp0
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-SITECORE_VERSION=10.0.0-2009
+SITECORE_VERSION=10.0-2009
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
 TELERIK_ENCRYPTION_KEY=
@@ -13,3 +13,4 @@ ID_HOST=xp0id.localhost
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
+SOLR_CORE_PREFIX_NAME=sitecore
diff --git a/compose/sxp/10.0/2009/xp0/docker-compose.yml b/compose/sxp/10.0/2009/xp0/docker-compose.yml
@@ -103,6 +103,7 @@ services:
       Sitecore_Identity_Server_InternalAuthority: http://id
       Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
       Sitecore_Identity_Server_Require_Https: "false"
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s

diff --git a/compose/sxp/10.0/2009/xp1/.env b/compose/sxp/10.0/2009/xp1/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=sitecore-xp1
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-SITECORE_VERSION=10.0.0-2009
+SITECORE_VERSION=10.0-2009
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
 REPORTING_API_KEY=
@@ -15,3 +15,4 @@ ID_HOST=xp1id.localhost
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
+SOLR_CORE_PREFIX_NAME=sitecore