Merge pull request #105 from Sitecore/issue/103/platform-10.0.1

[Closes #103] update all examples to Sitecore 10.0.1
Sitecore · Dec 16, 2020 · 25a948d · 25a948d
2 parents 0b973b8 + bcb3b8f
commit 25a948d
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 39 deletions.
diff --git a/examples/helix-basic-aspnetcore/.env b/examples/helix-basic-aspnetcore/.env
@@ -19,13 +19,14 @@ SITE_HOST=www.basic-company-aspnetcore.localhost
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
 SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/
 SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
-SITECORE_VERSION=10.0.0-ltsc2019
+SITECORE_VERSION=10.0-ltsc2019
 HEADLESS_SERVICES_VERSION=15.0.1-1809
 MANAGEMENT_SERVICES_VERSION=2.0.0-1809
 TOOLS_VERSION=10.0.0-1809
 
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
+SOLR_CORE_PREFIX_NAME=sitecore
 TELERIK_ENCRYPTION_KEY=
 SITECORE_IDSECRET=
 SITECORE_ID_CERTIFICATE=

diff --git a/examples/helix-basic-aspnetcore/docker-compose.override.yml b/examples/helix-basic-aspnetcore/docker-compose.override.yml
@@ -114,11 +114,6 @@ services:
     environment:
       SITECORE_LICENSE_LOCATION: C:\license\license.xml
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.cd.entrypoints=websecure"
-      - "traefik.http.routers.cd.rule=Host(`${CD_HOST}`)"
-      - "traefik.http.routers.cd.tls=true"
 
   cm:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

diff --git a/examples/helix-basic-aspnetcore/docker-compose.yml b/examples/helix-basic-aspnetcore/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/examples/helix-basic-tds-consolidated/.env b/examples/helix-basic-tds-consolidated/.env
@@ -16,11 +16,12 @@ SITE_HOST=www.basic-company-tds-consolidated.localhost
 
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
 SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
-SITECORE_VERSION=10.0.0-ltsc2019
+SITECORE_VERSION=10.0-ltsc2019
 TOOLS_VERSION=10.0.0-1809
 
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
+SOLR_CORE_PREFIX_NAME=sitecore
 TELERIK_ENCRYPTION_KEY=
 SITECORE_IDSECRET=
 SITECORE_ID_CERTIFICATE=

diff --git a/examples/helix-basic-tds-consolidated/README.md b/examples/helix-basic-tds-consolidated/README.md
@@ -53,7 +53,7 @@ Once complete, you can access the instance with the following.
 
 The serialized items will automatically sync when the instance is started, but you'll need to publish them.
 
-Login to Sitecore at https://cm.basic-company-tds-consolidated.localhost/sitecore and perform a site smart publish. Use "admin" and the password you specified on init ("b" by default).
+Login to Sitecore at https://cm.basic-company-tds-consolidated.localhost/sitecore. Ensure the items are done deploying (look for `/sitecore/content/Basic Company`), and perform a site smart publish. Use "admin" and the password you specified on init ("b" by default).
 
 You should now be able to view the Basic Company site at https://www.basic-company-tds-consolidated.localhost.
 

diff --git a/examples/helix-basic-tds-consolidated/docker-compose.override.yml b/examples/helix-basic-tds-consolidated/docker-compose.override.yml
@@ -74,10 +74,7 @@ services:
       SITECORE_LICENSE_LOCATION: C:\license\license.xml
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
     labels:
-      - "traefik.http.routers.site-secure.entrypoints=websecure"
-      - "traefik.http.routers.site-secure.rule=Host(`${SITE_HOST}`)"
-      - "traefik.http.routers.site-secure.tls=true"
-      - "traefik.http.routers.site-secure.middlewares=force-STS-Header"
+      - "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)"
 
   cm:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

diff --git a/examples/helix-basic-tds-consolidated/docker-compose.yml b/examples/helix-basic-tds-consolidated/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/examples/helix-basic-tds/.env b/examples/helix-basic-tds/.env
@@ -16,7 +16,7 @@ SITE_HOST=www.basic-company-tds.localhost
 
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
 SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
-SITECORE_VERSION=10.0.0-ltsc2019
+SITECORE_VERSION=10.0-ltsc2019
 TOOLS_VERSION=10.0.0-1809
 
 SITECORE_ADMIN_PASSWORD=
@@ -25,6 +25,7 @@ TELERIK_ENCRYPTION_KEY=
 SITECORE_IDSECRET=
 SITECORE_ID_CERTIFICATE=
 SITECORE_ID_CERTIFICATE_PASSWORD=
+SOLR_CORE_PREFIX_NAME=sitecore
 # Because we are using a mounted license file, this value can be empty.
 # Included here to suppress 'variable is not set' warning from docker-compose.
 SITECORE_LICENSE=

diff --git a/examples/helix-basic-tds/README.md b/examples/helix-basic-tds/README.md
@@ -53,7 +53,7 @@ Once complete, you can access the instance with the following.
 
 The serialized items will automatically sync when the instance is started, but you'll need to publish them.
 
-Login to Sitecore at https://cm.basic-company-tds.localhost/sitecore and perform a site smart publish. Use "admin" and the password you specified on init ("b" by default).
+Login to Sitecore at https://cm.basic-company-tds.localhost/sitecore. Ensure the items are done deploying (look for `/sitecore/content/Basic Company`), and perform a site smart publish. Use "admin" and the password you specified on init ("b" by default).
 
 You should now be able to view the Basic Company site at https://www.basic-company-tds.localhost.
 

diff --git a/examples/helix-basic-tds/docker-compose.override.yml b/examples/helix-basic-tds/docker-compose.override.yml
@@ -74,10 +74,7 @@ services:
       SITECORE_LICENSE_LOCATION: C:\license\license.xml
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
     labels:
-      - "traefik.http.routers.site-secure.entrypoints=websecure"
-      - "traefik.http.routers.site-secure.rule=Host(`${SITE_HOST}`)"
-      - "traefik.http.routers.site-secure.tls=true"
-      - "traefik.http.routers.site-secure.middlewares=force-STS-Header"
+      - "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)"
 
   cm:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

diff --git a/examples/helix-basic-tds/docker-compose.yml b/examples/helix-basic-tds/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/examples/helix-basic-unicorn/.env b/examples/helix-basic-unicorn/.env
@@ -20,11 +20,12 @@ SITE_HOST=www.basic-company-unicorn.localhost
 
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
 SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
-SITECORE_VERSION=10.0.0-ltsc2019
+SITECORE_VERSION=10.0-ltsc2019
 TOOLS_VERSION=10.0.0-1809
 
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
+SOLR_CORE_PREFIX_NAME=sitecore
 TELERIK_ENCRYPTION_KEY=
 SITECORE_IDSECRET=
 SITECORE_ID_CERTIFICATE=

diff --git a/examples/helix-basic-unicorn/docker-compose.override.yml b/examples/helix-basic-unicorn/docker-compose.override.yml
@@ -73,10 +73,7 @@ services:
       SITECORE_LICENSE_LOCATION: C:\license\license.xml
     entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
     labels:
-      - "traefik.http.routers.site-secure.entrypoints=websecure"
-      - "traefik.http.routers.site-secure.rule=Host(`${SITE_HOST}`)"
-      - "traefik.http.routers.site-secure.tls=true"
-      - "traefik.http.routers.site-secure.middlewares=force-STS-Header"
+      - "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)"
 
   cm:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

diff --git a/examples/helix-basic-unicorn/docker-compose.yml b/examples/helix-basic-unicorn/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