Skip to content

Commit 22f1414

Browse files
nickwesselmannickwesselman
authored
Merge pull request #106 from Sitecore/develop
Release merge
2 parents ebf756d + 25a948d commit 22f1414

20 files changed

Lines changed: 50 additions & 55 deletions

File tree

‎examples/helix-basic-aspnetcore/.env‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ SITE_HOST=www.basic-company-aspnetcore.localhost
1919
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
2020
SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/
2121
SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
22-
SITECORE_VERSION=10.0.0-ltsc2019
23-
HEADLESS_SERVICES_VERSION=14.0.0-1809
22+
SITECORE_VERSION=10.0-ltsc2019
23+
HEADLESS_SERVICES_VERSION=15.0.1-1809
2424
MANAGEMENT_SERVICES_VERSION=2.0.0-1809
2525
TOOLS_VERSION=10.0.0-1809
2626

2727
SITECORE_ADMIN_PASSWORD=
2828
SQL_SA_PASSWORD=
29+
SOLR_CORE_PREFIX_NAME=sitecore
2930
TELERIK_ENCRYPTION_KEY=
3031
SITECORE_IDSECRET=
3132
SITECORE_ID_CERTIFICATE=

‎examples/helix-basic-aspnetcore/Packages.props‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<PlatformVersion>10.0.0</PlatformVersion>
5+
<SitecoreAspNetVersion>15.0.1</SitecoreAspNetVersion>
56
</PropertyGroup>
67
<ItemGroup>
78
<PackageReference Update="Sitecore.Nexus" Version="$(PlatformVersion)" />
@@ -11,13 +12,13 @@
1112
<PackageReference Update="Sitecore.ContentSearch.Linq" Version="$(PlatformVersion)" />
1213
<PackageReference Update="Sitecore.ContentSearch.ContentExtraction" Version="$(PlatformVersion)" />
1314
<PackageReference Update="Sitecore.Assemblies.Platform" Version="$(PlatformVersion)" />
14-
1515
<PackageReference Update="Sitecore.LayoutService" Version="6.0.0" />
16-
<PackageReference Update="Sitecore.LayoutService.Client" Version="14.0.0" />
17-
<PackageReference Update="Sitecore.AspNet.RenderingEngine" Version="14.0.0" />
18-
<PackageReference Update="Sitecore.AspNet.ExperienceEditor" Version="14.0.0" />
19-
<PackageReference Update="Sitecore.AspNet.Tracking" Version="14.0.0" />
20-
<PackageReference Update="Sitecore.AspNet.Tracking.VisitorIdentification" Version="14.0.0" />
16+
17+
<PackageReference Update="Sitecore.LayoutService.Client" Version="$(SitecoreAspNetVersion)" />
18+
<PackageReference Update="Sitecore.AspNet.RenderingEngine" Version="$(SitecoreAspNetVersion)" />
19+
<PackageReference Update="Sitecore.AspNet.ExperienceEditor" Version="$(SitecoreAspNetVersion)" />
20+
<PackageReference Update="Sitecore.AspNet.Tracking" Version="$(SitecoreAspNetVersion)" />
21+
<PackageReference Update="Sitecore.AspNet.Tracking.VisitorIdentification" Version="$(SitecoreAspNetVersion)" />
2122

2223
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
2324
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.1" />

‎examples/helix-basic-aspnetcore/docker-compose.override.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,6 @@ services:
114114
environment:
115115
SITECORE_LICENSE_LOCATION: C:\license\license.xml
116116
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
117-
labels:
118-
- "traefik.enable=true"
119-
- "traefik.http.routers.cd.entrypoints=websecure"
120-
- "traefik.http.routers.cd.rule=Host(`${CD_HOST}`)"
121-
- "traefik.http.routers.cd.tls=true"
122117

123118
cm:
124119
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

‎examples/helix-basic-aspnetcore/docker-compose.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ services:
99
- "--providers.docker.endpoint=npipe:////./pipe/docker_engine"
1010
- "--providers.docker.exposedByDefault=false"
1111
- "--providers.file.directory=C:/etc/traefik/config/dynamic"
12-
- "--entryPoints.web.address=:80"
1312
- "--entryPoints.websecure.address=:443"
1413
ports:
15-
- "8080:80"
1614
- "443:443"
1715
- "8079:8080"
1816
healthcheck:
@@ -95,13 +93,15 @@ services:
9593
Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr
9694
Sitecore_ConnectionStrings_Redis.Sessions: redis:6379,ssl=False,abortConnect=False
9795
Sitecore_License: ${SITECORE_LICENSE}
96+
SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
9897
healthcheck:
9998
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
10099
timeout: 300s
101100
labels:
102101
- "traefik.enable=true"
103-
- "traefik.http.routers.cd.entrypoints=web"
104-
- "traefik.http.routers.cd.rule=Host(`${CD_HOST}`)"
102+
- "traefik.http.routers.cd-secure.entrypoints=websecure"
103+
- "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
104+
- "traefik.http.routers.cd-secure.tls=true"
105105
cm:
106106
isolation: ${ISOLATION}
107107
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
@@ -129,6 +129,7 @@ services:
129129
Sitecore_Identity_Server_InternalAuthority: http://id
130130
Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
131131
Sitecore_Identity_Server_Require_Https: "false"
132+
SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
132133
healthcheck:
133134
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
134135
timeout: 300s

‎examples/helix-basic-aspnetcore/docker/build/dotnetsdk/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FROM ${BUILD_IMAGE}
1313

1414
# Ensure updated nuget. Depending on your Windows version, dotnet/framework/sdk:4.8 tag may provide an outdated client.
1515
# See https://github.com/microsoft/dotnet-framework-docker/blob/1c3dd6638c6b827b81ffb13386b924f6dcdee533/4.8/sdk/windowsservercore-ltsc2019/Dockerfile#L7
16-
ENV NUGET_VERSION 5.6.0
16+
ENV NUGET_VERSION 5.8.0
1717
RUN Invoke-WebRequest "https://dist.nuget.org/win-x86-commandline/v$env:NUGET_VERSION/nuget.exe" -UseBasicParsing -OutFile "$env:ProgramFiles\NuGet\nuget.exe"
1818

1919
## Install netcore onto SDK image

‎examples/helix-basic-aspnetcore/init.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ if (-not $SitecoreGallery) {
3535
# Install and Import SitecoreDockerTools
3636
$dockerToolsVersion = "10.0.5"
3737
Remove-Module SitecoreDockerTools -ErrorAction SilentlyContinue
38-
if (-not (Get-InstalledModule -Name SitecoreDockerTools -RequiredVersion $dockerToolsVersion -AllowPrerelease -ErrorAction SilentlyContinue)) {
38+
if (-not (Get-InstalledModule -Name SitecoreDockerTools -RequiredVersion $dockerToolsVersion -ErrorAction SilentlyContinue)) {
3939
Write-Host "Installing SitecoreDockerTools..." -ForegroundColor Green
40-
Install-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion -AllowPrerelease -Scope CurrentUser -Repository $SitecoreGallery.Name
40+
Install-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion -Scope CurrentUser -Repository $SitecoreGallery.Name
4141
}
4242
Write-Host "Importing SitecoreDockerTools..." -ForegroundColor Green
4343
Import-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion

‎examples/helix-basic-tds-consolidated/.env‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ SITE_HOST=www.basic-company-tds-consolidated.localhost
1616

1717
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
1818
SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
19-
SITECORE_VERSION=10.0.0-ltsc2019
19+
SITECORE_VERSION=10.0-ltsc2019
2020
TOOLS_VERSION=10.0.0-1809
2121

2222
SITECORE_ADMIN_PASSWORD=
2323
SQL_SA_PASSWORD=
24+
SOLR_CORE_PREFIX_NAME=sitecore
2425
TELERIK_ENCRYPTION_KEY=
2526
SITECORE_IDSECRET=
2627
SITECORE_ID_CERTIFICATE=

‎examples/helix-basic-tds-consolidated/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Once complete, you can access the instance with the following.
5353

5454
The serialized items will automatically sync when the instance is started, but you'll need to publish them.
5555

56-
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).
56+
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).
5757

5858
You should now be able to view the Basic Company site at https://www.basic-company-tds-consolidated.localhost.
5959

‎examples/helix-basic-tds-consolidated/docker-compose.override.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ services:
7474
SITECORE_LICENSE_LOCATION: C:\license\license.xml
7575
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
7676
labels:
77-
- "traefik.http.routers.site-secure.entrypoints=websecure"
78-
- "traefik.http.routers.site-secure.rule=Host(`${SITE_HOST}`)"
79-
- "traefik.http.routers.site-secure.tls=true"
80-
- "traefik.http.routers.site-secure.middlewares=force-STS-Header"
77+
- "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)"
8178

8279
cm:
8380
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

‎examples/helix-basic-tds-consolidated/docker-compose.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ services:
99
- "--providers.docker.endpoint=npipe:////./pipe/docker_engine"
1010
- "--providers.docker.exposedByDefault=false"
1111
- "--providers.file.directory=C:/etc/traefik/config/dynamic"
12-
- "--entryPoints.web.address=:80"
1312
- "--entryPoints.websecure.address=:443"
1413
ports:
15-
- "8080:80"
1614
- "443:443"
1715
- "8079:8080"
1816
healthcheck:
@@ -95,13 +93,15 @@ services:
9593
Sitecore_ConnectionStrings_Solr.Search: http://solr:8983/solr
9694
Sitecore_ConnectionStrings_Redis.Sessions: redis:6379,ssl=False,abortConnect=False
9795
Sitecore_License: ${SITECORE_LICENSE}
96+
SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
9897
healthcheck:
9998
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
10099
timeout: 300s
101100
labels:
102101
- "traefik.enable=true"
103-
- "traefik.http.routers.cd.entrypoints=web"
104-
- "traefik.http.routers.cd.rule=Host(`${CD_HOST}`)"
102+
- "traefik.http.routers.cd-secure.entrypoints=websecure"
103+
- "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
104+
- "traefik.http.routers.cd-secure.tls=true"
105105
cm:
106106
isolation: ${ISOLATION}
107107
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
@@ -129,6 +129,7 @@ services:
129129
Sitecore_Identity_Server_InternalAuthority: http://id
130130
Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
131131
Sitecore_Identity_Server_Require_Https: "false"
132+
SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
132133
healthcheck:
133134
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
134135
timeout: 300s

0 commit comments

Comments
 (0)