Merge pull request #29 from Sitecore/develop

Release merge v10.0.1.0
Sitecore · Dec 17, 2020 · 2a8eb6a · 2a8eb6a
2 parents e7408b9 + f843cb7
commit 2a8eb6a
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/custom-images/.env b/custom-images/.env
@@ -16,7 +16,7 @@ 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.0-ltsc2019
+SITECORE_VERSION=10.0-ltsc2019
 TOOLS_VERSION=10.0.0-1809
 SPE_VERSION=6.1.1-1809
 SXA_VERSION=10.0.0-1809
@@ -31,4 +31,5 @@ SITECORE_ID_CERTIFICATE_PASSWORD=
 SITECORE_LICENSE=
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
-ISOLATION=default
+ISOLATION=default
+SOLR_CORE_PREFIX_NAME=sitecore
diff --git a/custom-images/docker-compose.xm1.override.yml b/custom-images/docker-compose.xm1.override.yml
@@ -68,9 +68,6 @@ services:
       - ${LOCAL_DEPLOY_PATH}\website:C:\deploy
       - ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
-    labels:
-      - "traefik.http.routers.cd.entrypoints=websecure"
-      - "traefik.http.routers.cd.tls=true"
 
   cm:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

diff --git a/custom-images/docker-compose.xm1.yml b/custom-images/docker-compose.xm1.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/custom-images/docker-compose.xp1.override.yml b/custom-images/docker-compose.xp1.override.yml
@@ -68,9 +68,6 @@ services:
       - ${LOCAL_DEPLOY_PATH}\website:C:\deploy
       - ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
-    labels:
-      - "traefik.http.routers.cd.entrypoints=websecure"
-      - "traefik.http.routers.cd.tls=true"
 
   cm:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-cm:${VERSION:-latest}

diff --git a/custom-images/docker-compose.xp1.yml b/custom-images/docker-compose.xp1.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'
@@ -381,4 +382,4 @@ services:
       Sitecore_License: ${SITECORE_LICENSE}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1 -Port 8080"]
-      timeout: 300s
+      timeout: 300s
diff --git a/custom-images/docker-compose.yml b/custom-images/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
@@ -194,4 +195,4 @@ services:
       Sitecore_License: ${SITECORE_LICENSE}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1 -Port 8080"]
-      timeout: 300s
+      timeout: 300s
diff --git a/getting-started/.env b/getting-started/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=sitecore-xp0
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-SITECORE_VERSION=10.0.0-ltsc2019
+SITECORE_VERSION=10.0-ltsc2019
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
 TELERIK_ENCRYPTION_KEY=
@@ -12,4 +12,5 @@ CM_HOST=xp0cm.localhost
 ID_HOST=xp0id.localhost
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
-ISOLATION=default
+ISOLATION=default
+SOLR_CORE_PREFIX_NAME=sitecore
diff --git a/getting-started/docker-compose.yml b/getting-started/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
@@ -194,4 +195,4 @@ services:
       Sitecore_License: ${SITECORE_LICENSE}
     healthcheck:
       test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1 -Port 8080"]
-      timeout: 300s
+      timeout: 300s