Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release merge v10.0.1.0 #29

Merged
merged 3 commits into from
Dec 17, 2020
Merged

Release merge v10.0.1.0 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a8861c
[#27] updated getting-started for 10.0.1
nickwesselman Dec 17, 2020
3845f1a
[#27] update custom-images for 10.0.1
nickwesselman Dec 17, 2020
f843cb7
Merge pull request #28 from Sitecore/issue/27/update-to-10.0.1
nickwesselman Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions custom-images/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
3 changes: 0 additions & 3 deletions custom-images/docker-compose.xm1.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
9 changes: 5 additions & 4 deletions custom-images/docker-compose.xm1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions custom-images/docker-compose.xp1.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
15 changes: 8 additions & 7 deletions custom-images/docker-compose.xp1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -381,4 +382,4 @@ services:
Sitecore_License: ${SITECORE_LICENSE}
healthcheck:
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1 -Port 8080"]
timeout: 300s
timeout: 300s
3 changes: 2 additions & 1 deletion custom-images/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -194,4 +195,4 @@ services:
Sitecore_License: ${SITECORE_LICENSE}
healthcheck:
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1 -Port 8080"]
timeout: 300s
timeout: 300s
5 changes: 3 additions & 2 deletions getting-started/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=
Expand All @@ -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
3 changes: 2 additions & 1 deletion getting-started/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -194,4 +195,4 @@ services:
Sitecore_License: ${SITECORE_LICENSE}
healthcheck:
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1 -Port 8080"]
timeout: 300s
timeout: 300s