Skip to content

Commit

Permalink
Merge pull request #2 from Sitecore/feature/add_support_package_150
Browse files Browse the repository at this point in the history
Add SXP Sitecore Container Deployment 10.0.0.004346.150
  • Loading branch information
Jonas Bang Christensen authored Dec 4, 2020
2 parents 3238b58 + 753b10b commit 93ae971
Show file tree
Hide file tree
Showing 146 changed files with 966 additions and 87 deletions.
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xm1/mssql-data/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
database files will be mounted here
database files will be mounted here
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xm1/solr-data/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
solr indexes will be mounted here
solr indexes will be mounted here
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xm1/traefik/certs/readme
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Add TLS certificates for xm1cm.localhost and xm1id.localhost hosts to this folde
xm1cm.localhost.crt
xm1cm.localhost.key
xm1id.localhost.crt
xm1id.localhost.key
xm1id.localhost.key
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ tls:
- certFile: C:\etc\traefik\certs\xm1cm.localhost.crt
keyFile: C:\etc\traefik\certs\xm1cm.localhost.key
- certFile: C:\etc\traefik\certs\xm1id.localhost.crt
keyFile: C:\etc\traefik\certs\xm1id.localhost.key
keyFile: C:\etc\traefik\certs\xm1id.localhost.key
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xp0/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,4 @@ services:
Sitecore_License: ${SITECORE_LICENSE}
healthcheck:
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1 -Port 8080"]
timeout: 300s
timeout: 300s
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xp0/mssql-data/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
database files will be mounted here
database files will be mounted here
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xp0/solr-data/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
solr indexes will be mounted here
solr indexes will be mounted here
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xp0/traefik/certs/readme
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Add TLS certificates for xp0cm.localhost and xp0id.localhost hosts to this folde
xp0cm.localhost.crt
xp0cm.localhost.key
xp0id.localhost.crt
xp0id.localhost.key
xp0id.localhost.key
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ tls:
- certFile: C:\etc\traefik\certs\xp0cm.localhost.crt
keyFile: C:\etc\traefik\certs\xp0cm.localhost.key
- certFile: C:\etc\traefik\certs\xp0id.localhost.crt
keyFile: C:\etc\traefik\certs\xp0id.localhost.key
keyFile: C:\etc\traefik\certs\xp0id.localhost.key
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xp1/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -381,4 +381,4 @@ services:
Sitecore_License: ${SITECORE_LICENSE}
healthcheck:
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1 -Port 8080"]
timeout: 300s
timeout: 300s
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xp1/mssql-data/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
database files will be mounted here
database files will be mounted here
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xp1/solr-data/readme.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
solr indexes will be mounted here
solr indexes will be mounted here
2 changes: 1 addition & 1 deletion compose/sxp/10.0/1909/xp1/traefik/certs/readme
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Add TLS certificates for xp1cm.localhost and xp1id.localhost hosts to this folde
xp1cm.localhost.crt
xp1cm.localhost.key
xp1id.localhost.crt
xp1id.localhost.key
xp1id.localhost.key
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ tls:
- certFile: C:\etc\traefik\certs\xp1cm.localhost.crt
keyFile: C:\etc\traefik\certs\xp1cm.localhost.key
- certFile: C:\etc\traefik\certs\xp1id.localhost.crt
keyFile: C:\etc\traefik\certs\xp1id.localhost.key
keyFile: C:\etc\traefik\certs\xp1id.localhost.key
16 changes: 16 additions & 0 deletions compose/sxp/10.0/2004/xm1/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
COMPOSE_PROJECT_NAME=sitecore-xm1
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
SITECORE_VERSION=10.0.0-2004
SITECORE_ADMIN_PASSWORD=
SQL_SA_PASSWORD=
TELERIK_ENCRYPTION_KEY=
SITECORE_IDSECRET=
SITECORE_ID_CERTIFICATE=
SITECORE_ID_CERTIFICATE_PASSWORD=
SITECORE_LICENSE=
CD_HOST=xm1cd.localhost
CM_HOST=xm1cm.localhost
ID_HOST=xm1id.localhost
TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
TRAEFIK_ISOLATION=hyperv
ISOLATION=default
142 changes: 142 additions & 0 deletions compose/sxp/10.0/2004/xm1/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
version: "2.4"
services:
traefik:
isolation: ${TRAEFIK_ISOLATION}
image: ${TRAEFIK_IMAGE}
command:
- "--ping"
- "--api.insecure=true"
- "--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:
test: ["CMD", "traefik", "healthcheck", "--ping"]
volumes:
- source: \\.\pipe\docker_engine
target: \\.\pipe\docker_engine
type: npipe
- ./traefik:C:/etc/traefik
depends_on:
id:
condition: service_healthy
cd:
condition: service_healthy
cm:
condition: service_healthy
redis:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-redis:${SITECORE_VERSION}
mssql:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-mssql:${SITECORE_VERSION}
environment:
SA_PASSWORD: ${SQL_SA_PASSWORD}
SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD}
ACCEPT_EULA: "Y"
ports:
- "14330:1433"
volumes:
- type: bind
source: .\mssql-data
target: c:\data
solr:
isolation: ${ISOLATION}
ports:
- "8984:8983"
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr:${SITECORE_VERSION}
volumes:
- type: bind
source: .\solr-data
target: c:\data
id:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
environment:
Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
Sitecore_Sitecore__IdentityServer__Clients__PasswordClient__ClientSecrets__ClientSecret1: ${SITECORE_IDSECRET}
Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1: https://${CM_HOST}
Sitecore_Sitecore__IdentityServer__CertificateRawData: ${SITECORE_ID_CERTIFICATE}
Sitecore_Sitecore__IdentityServer__PublicOrigin: https://${ID_HOST}
Sitecore_Sitecore__IdentityServer__CertificateRawDataPassword: ${SITECORE_ID_CERTIFICATE_PASSWORD}
Sitecore_License: ${SITECORE_LICENSE}
healthcheck:
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
timeout: 300s
depends_on:
mssql:
condition: service_healthy
labels:
- "traefik.enable=true"
- "traefik.http.routers.id-secure.entrypoints=websecure"
- "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)"
- "traefik.http.routers.id-secure.tls=true"
cd:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION}
depends_on:
mssql:
condition: service_healthy
solr:
condition: service_started
redis:
condition: service_started
environment:
Sitecore_AppSettings_instanceNameMode:define: default
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_Redis.Sessions: redis:6379,ssl=False,abortConnect=False
Sitecore_License: ${SITECORE_LICENSE}
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}`)"
cm:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
depends_on:
mssql:
condition: service_healthy
solr:
condition: service_started
id:
condition: service_started
environment:
Sitecore_AppSettings_instanceNameMode:define: default
Sitecore_ConnectionStrings_Core: Data Source=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
Sitecore_ConnectionStrings_Security: Data Source=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
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_Sitecoreidentity.secret: ${SITECORE_IDSECRET}
Sitecore_AppSettings_Telerik.AsyncUpload.ConfigurationEncryptionKey: ${TELERIK_ENCRYPTION_KEY}
Sitecore_AppSettings_Telerik.Upload.ConfigurationHashKey: ${TELERIK_ENCRYPTION_KEY}
Sitecore_AppSettings_Telerik.Web.UI.DialogParametersEncryptionKey: ${TELERIK_ENCRYPTION_KEY}
Sitecore_License: ${SITECORE_LICENSE}
Sitecore_Identity_Server_Authority: https://${ID_HOST}
Sitecore_Identity_Server_InternalAuthority: http://id
Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
Sitecore_Identity_Server_Require_Https: "false"
healthcheck:
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
timeout: 300s
labels:
- "traefik.enable=true"
- "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
- "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
- "traefik.http.routers.cm-secure.entrypoints=websecure"
- "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)"
- "traefik.http.routers.cm-secure.tls=true"
- "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
1 change: 1 addition & 0 deletions compose/sxp/10.0/2004/xm1/mssql-data/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
database files will be mounted here
1 change: 1 addition & 0 deletions compose/sxp/10.0/2004/xm1/solr-data/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
solr indexes will be mounted here
5 changes: 5 additions & 0 deletions compose/sxp/10.0/2004/xm1/traefik/certs/readme
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Add TLS certificates for xm1cm.localhost and xm1id.localhost hosts to this folder:
xm1cm.localhost.crt
xm1cm.localhost.key
xm1id.localhost.crt
xm1id.localhost.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
tls:
certificates:
- certFile: C:\etc\traefik\certs\xm1cm.localhost.crt
keyFile: C:\etc\traefik\certs\xm1cm.localhost.key
- certFile: C:\etc\traefik\certs\xm1id.localhost.crt
keyFile: C:\etc\traefik\certs\xm1id.localhost.key
15 changes: 15 additions & 0 deletions compose/sxp/10.0/2004/xp0/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
COMPOSE_PROJECT_NAME=sitecore-xp0
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
SITECORE_VERSION=10.0.0-2004
SITECORE_ADMIN_PASSWORD=
SQL_SA_PASSWORD=
TELERIK_ENCRYPTION_KEY=
SITECORE_IDSECRET=
SITECORE_ID_CERTIFICATE=
SITECORE_ID_CERTIFICATE_PASSWORD=
SITECORE_LICENSE=
CM_HOST=xp0cm.localhost
ID_HOST=xp0id.localhost
TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
TRAEFIK_ISOLATION=hyperv
ISOLATION=default
Loading

0 comments on commit 93ae971

Please sign in to comment.