Skip to content

Commit 25aa2b3

Browse files
nickwesselmannickwesselman
authored
Merge pull request #32 from Sitecore/develop
Release for Sitecore XP 10.1
2 parents 5a9415d + 870483f commit 25aa2b3

20 files changed

Lines changed: 198 additions & 127 deletions

‎custom-images/.env‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ID_HOST=id.dockerexamples.localhost
1616
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
1717
SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
1818
SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/
19-
SITECORE_VERSION=10.0-ltsc2019
20-
TOOLS_VERSION=10.0.0-1809
21-
SPE_VERSION=6.1.1-1809
22-
SXA_VERSION=10.0.0-1809
19+
SITECORE_VERSION=10.1-ltsc2019
20+
TOOLS_VERSION=10.1-1809
21+
SPE_VERSION=6.2-1809
22+
SXA_VERSION=10.1-1809
2323

2424
SITECORE_ADMIN_PASSWORD=
2525
SQL_SA_PASSWORD=
@@ -32,4 +32,5 @@ SITECORE_LICENSE=
3232
TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
3333
TRAEFIK_ISOLATION=hyperv
3434
ISOLATION=default
35-
SOLR_CORE_PREFIX_NAME=sitecore
35+
SOLR_CORE_PREFIX_NAME=sitecore
36+
MEDIA_REQUEST_PROTECTION_SHARED_SECRET=

‎custom-images/Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<Project>
2-
<Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.46" />
2+
<Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.79" />
33
</Project>

‎custom-images/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ARG BASE_IMAGE
44
ARG BUILD_IMAGE
55

66
FROM ${BUILD_IMAGE} AS prep
7+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
78

89
# Gather only artifacts necessary for NuGet restore, retaining directory structure
910
COPY *.sln nuget.config Directory.Build.targets Packages.props \nuget\

‎custom-images/Packages.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<PlatformVersion>10.0.1</PlatformVersion>
4+
<PlatformVersion>10.1.0</PlatformVersion>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Update="Sitecore.XConnect" Version="$(PlatformVersion)" />
88
<PackageReference Update="Sitecore.XConnect.Client" Version="$(PlatformVersion)" />
99
<PackageReference Update="Sitecore.XConnect.Collection.Model" Version="$(PlatformVersion)" />
10+
<PackageReference Update="Sitecore.Assemblies.Platform" Version="$(PlatformVersion)" />
1011
<PackageReference Update="Sitecore.Assemblies.XConnect.Web" Version="$(PlatformVersion)" />
1112
</ItemGroup>
1213
</Project>

‎custom-images/docker-compose.override.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,19 @@ services:
2828
volumes:
2929
- ${LOCAL_DATA_PATH}\mssql:c:\data
3030

31+
# Mount our Solr data folder
3132
solr:
32-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp0-solr:${VERSION:-latest}
33+
volumes:
34+
- ${LOCAL_DATA_PATH}\solr:c:\data
35+
36+
# Some modules (like SXA) also require additions to the Solr image.
37+
solr-init:
38+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp0-solr-init:${VERSION:-latest}
3339
build:
34-
context: ./docker/build/solr
40+
context: ./docker/build/solr-init
3541
args:
36-
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp0-solr:${SITECORE_VERSION}
42+
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp0-solr-init:${SITECORE_VERSION}
3743
SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sxa-xp1-assets:${SXA_VERSION}
38-
mem_limit: 1GB
39-
volumes:
40-
- ${LOCAL_DATA_PATH}\solr:c:\data
4144

4245
id:
4346
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
@@ -61,6 +64,8 @@ services:
6164
volumes:
6265
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
6366
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
67+
environment:
68+
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
6469
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
6570

6671
xconnect:

‎custom-images/docker-compose.xm1.override.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,19 @@ services:
3535
volumes:
3636
- ${LOCAL_DATA_PATH}\mssql:c:\data
3737

38+
# Mount our Solr data folder
3839
solr:
39-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-solr:${VERSION:-latest}
40+
volumes:
41+
- ${LOCAL_DATA_PATH}\solr:c:\data
42+
43+
# Some modules (like SXA) also require additions to the Solr image.
44+
solr-init:
45+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-solr-init:${VERSION:-latest}
4046
build:
41-
context: ./docker/build/solr
47+
context: ./docker/build/solr-init
4248
args:
43-
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr:${SITECORE_VERSION}
49+
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr-init:${SITECORE_VERSION}
4450
SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sxa-xm1-assets:${SXA_VERSION}
45-
mem_limit: 1GB
46-
volumes:
47-
- ${LOCAL_DATA_PATH}\solr:c:\data
4851

4952
id:
5053
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
@@ -67,6 +70,8 @@ services:
6770
volumes:
6871
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
6972
- ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
73+
environment:
74+
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
7075
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
7176

7277
cm:
@@ -84,4 +89,6 @@ services:
8489
volumes:
8590
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
8691
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
92+
environment:
93+
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
8794
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"

‎custom-images/docker-compose.xm1.yml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,24 @@ services:
4545
target: c:\data
4646
solr:
4747
isolation: ${ISOLATION}
48+
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION}
4849
ports:
4950
- "8984:8983"
50-
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr:${SITECORE_VERSION}
5151
volumes:
5252
- type: bind
5353
source: .\solr-data
5454
target: c:\data
55+
environment:
56+
SOLR_MODE: solrcloud
57+
solr-init:
58+
isolation: ${ISOLATION}
59+
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr-init:${SITECORE_VERSION}
60+
environment:
61+
SITECORE_SOLR_CONNECTION_STRING: http://solr:8983/solr
62+
SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
63+
depends_on:
64+
solr:
65+
condition: service_healthy
5566
id:
5667
isolation: ${ISOLATION}
5768
image: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
@@ -81,7 +92,7 @@ services:
8192
depends_on:
8293
mssql:
8394
condition: service_healthy
84-
solr:
95+
solr-init:
8596
condition: service_started
8697
redis:
8798
condition: service_started
@@ -90,10 +101,11 @@ services:
90101
Sitecore_ConnectionStrings_Security: Data Source=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
91102
Sitecore_ConnectionStrings_Web: Data Source=mssql;Initial Catalog=Sitecore.Web;User ID=sa;Password=${SQL_SA_PASSWORD}
92103
Sitecore_ConnectionStrings_ExperienceForms: Data Source=mssql;Initial Catalog=Sitecore.ExperienceForms;User ID=sa;Password=${SQL_SA_PASSWORD}
93-
Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr
104+
Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr;solrCloud=true
94105
Sitecore_ConnectionStrings_Redis.Sessions: redis:6379,ssl=False,abortConnect=False
95106
Sitecore_License: ${SITECORE_LICENSE}
96107
SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
108+
MEDIA_REQUEST_PROTECTION_SHARED_SECRET: ${MEDIA_REQUEST_PROTECTION_SHARED_SECRET}
97109
healthcheck:
98110
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
99111
timeout: 300s
@@ -108,7 +120,7 @@ services:
108120
depends_on:
109121
mssql:
110122
condition: service_healthy
111-
solr:
123+
solr-init:
112124
condition: service_started
113125
id:
114126
condition: service_started
@@ -119,7 +131,7 @@ services:
119131
Sitecore_ConnectionStrings_Master: Data Source=mssql;Initial Catalog=Sitecore.Master;User ID=sa;Password=${SQL_SA_PASSWORD}
120132
Sitecore_ConnectionStrings_Web: Data Source=mssql;Initial Catalog=Sitecore.Web;User ID=sa;Password=${SQL_SA_PASSWORD}
121133
Sitecore_ConnectionStrings_ExperienceForms: Data Source=mssql;Initial Catalog=Sitecore.ExperienceForms;User ID=sa;Password=${SQL_SA_PASSWORD}
122-
Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr
134+
Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr;solrCloud=true
123135
Sitecore_ConnectionStrings_Sitecoreidentity.secret: ${SITECORE_IDSECRET}
124136
Sitecore_AppSettings_Telerik.AsyncUpload.ConfigurationEncryptionKey: ${TELERIK_ENCRYPTION_KEY}
125137
Sitecore_AppSettings_Telerik.Upload.ConfigurationHashKey: ${TELERIK_ENCRYPTION_KEY}
@@ -130,6 +142,7 @@ services:
130142
Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
131143
Sitecore_Identity_Server_Require_Https: "false"
132144
SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
145+
MEDIA_REQUEST_PROTECTION_SHARED_SECRET: ${MEDIA_REQUEST_PROTECTION_SHARED_SECRET}
133146
healthcheck:
134147
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
135148
timeout: 300s

‎custom-images/docker-compose.xp1.override.yml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,19 @@ services:
3535
volumes:
3636
- ${LOCAL_DATA_PATH}\mssql:c:\data
3737

38+
# Mount our Solr data folder
3839
solr:
39-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-solr:${VERSION:-latest}
40+
volumes:
41+
- ${LOCAL_DATA_PATH}\solr:c:\data
42+
43+
# Some modules (like SXA) also require additions to the Solr image.
44+
solr-init:
45+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-solr-init:${VERSION:-latest}
4046
build:
41-
context: ./docker/build/solr
47+
context: ./docker/build/solr-init
4248
args:
43-
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-solr:${SITECORE_VERSION}
49+
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-solr-init:${SITECORE_VERSION}
4450
SXA_IMAGE: ${SITECORE_MODULE_REGISTRY}sxa-xp1-assets:${SXA_VERSION}
45-
mem_limit: 1GB
46-
volumes:
47-
- ${LOCAL_DATA_PATH}\solr:c:\data
4851

4952
id:
5053
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
@@ -67,6 +70,8 @@ services:
6770
volumes:
6871
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
6972
- ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
73+
environment:
74+
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
7075
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
7176

7277
cm:
@@ -84,6 +89,8 @@ services:
8489
volumes:
8590
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
8691
- ${LOCAL_DATA_PATH}\cm:C:\inetpub\wwwroot\App_Data\logs
92+
environment:
93+
SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff
8794
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
8895

8996
prc:
@@ -96,16 +103,6 @@ services:
96103
depends_on:
97104
- solution
98105

99-
rep:
100-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-rep:${VERSION:-latest}
101-
build:
102-
context: ./docker/build/rep
103-
args:
104-
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-rep:${SITECORE_VERSION}
105-
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
106-
depends_on:
107-
- solution
108-
109106
xdbcollection:
110107
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-xdbcollection:${VERSION:-latest}
111108
build:

0 commit comments

Comments
 (0)