Skip to content

Upgrade helix-basic-unicorn to Sitecore 10.2 #144

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade helix-basic-unicorn to Sitecore 10.2 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0081e5
Upgrade helix-basic-unicorn to Sitecore 10.2
Mar 13, 2022
8fdd5c0
Added mssql-init
Mar 14, 2022
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
6 changes: 3 additions & 3 deletions examples/helix-basic-unicorn/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ SITE_HOST=www.basic-company-unicorn.localhost

SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
SITECORE_VERSION=10.1-ltsc2019
TOOLS_VERSION=10.1-1809
SITECORE_VERSION=10.2-ltsc2019
TOOLS_VERSION=10.2-1809

SITECORE_ADMIN_PASSWORD=
SQL_SA_PASSWORD=
Expand All @@ -36,4 +36,4 @@ SITECORE_LICENSE=
TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
TRAEFIK_ISOLATION=hyperv
ISOLATION=default
MEDIA_REQUEST_PROTECTION_SHARED_SECRET=
MEDIA_REQUEST_PROTECTION_SHARED_SECRET=
13 changes: 6 additions & 7 deletions examples/helix-basic-unicorn/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PlatformVersion>10.1.0</PlatformVersion>
<PlatformVersion>10.2.0</PlatformVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Update="Sitecore.Nexus" Version="$(PlatformVersion)" />
<PackageReference Update="Sitecore.Kernel" Version="$(PlatformVersion)" />
<PackageReference Update="Sitecore.Mvc" Version="$(PlatformVersion)" />
<PackageReference Update="Sitecore.ContentSearch" Version="$(PlatformVersion)" />
<PackageReference Update="Sitecore.ContentSearch.Linq" Version="$(PlatformVersion)" />
<PackageReference Update="Sitecore.ContentSearch.ContentExtraction" Version="$(PlatformVersion)" />
<PackageReference Update="Sitecore.Assemblies.Platform" Version="$(PlatformVersion)" />

<PackageReference Update="Unicorn" Version="4.1.4" />
<PackageReference Update="Unicorn.Roles" Version="4.1.4" />
<PackageReference Update="Unicorn.Users" Version="4.1.4" />
<PackageReference Update="Unicorn" Version="4.1.6" />
<PackageReference Update="Unicorn.Roles" Version="4.1.6" />
<PackageReference Update="Unicorn.Users" Version="4.1.6" />
<PackageReference Update="Sitecore.FakeDb" Version="3.0.0-alpha1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.2.0" />
<PackageReference Update="Moq" Version="4.10.1" />
<PackageReference Update="Moq" Version="4.17.2" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Update="RichardSzalay.Helix.Publishing.WebRoot" Version="1.5.6" />
</ItemGroup>
</Project>
16 changes: 8 additions & 8 deletions examples/helix-basic-unicorn/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ services:
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-redis:${SITECORE_VERSION}

mssql:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-mssql:${VERSION:-latest}
build:
context: ./docker/build/mssql
args:
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-mssql:${SITECORE_VERSION}
mem_limit: 2GB
volumes:
- ${LOCAL_DATA_PATH}\mssql:c:\data

mssql-init:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-mssql-init:${VERSION:-latest}
build:
context: ./docker/build/mssql-init
args:
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-mssql-init:${SITECORE_VERSION}
solr:
volumes:
- ${LOCAL_DATA_PATH}\solr:c:\data
Expand All @@ -46,11 +46,11 @@ services:
mem_limit: 1GB

id:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id:${VERSION:-latest}
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id6:${VERSION:-latest}
build:
context: ./docker/build/id
args:
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
BASE_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
volumes:
- ${HOST_LICENSE_FOLDER}:C:\license
environment:
Expand Down
31 changes: 25 additions & 6 deletions examples/helix-basic-unicorn/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ services:
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}
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${SITECORE_VERSION}
environment:
SA_PASSWORD: ${SQL_SA_PASSWORD}
SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD}
Expand All @@ -43,17 +42,37 @@ services:
- type: bind
source: .\mssql-data
target: c:\data

mssql-init:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-mssql-init:${SITECORE_VERSION}
environment:
SQL_SERVER: mssql
SQL_ADMIN_LOGIN: sa
SQL_ADMIN_PASSWORD: ${SQL_SA_PASSWORD}
SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD}
POST_DEPLOYMENT_WAIT_PERIOD: 300
healthcheck:
test: ["CMD", "powershell", "-command", "if ([System.Environment]::GetEnvironmentVariable('DatabasesDeploymentStatus', 'Machine') -eq 'Complete') { exit 0 } else { exit 1}"]
start_period: 300s
interval: 5s
depends_on:
mssql:
condition: service_healthy

solr:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.8.2-${SITECORE_VERSION}
ports:
- "8984:8983"
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION}
volumes:
- type: bind
source: .\solr-data
target: c:\data
environment:
SOLR_MODE: solrcloud
healthcheck:
test: ["CMD", "powershell", "-command", "try { $$statusCode = (iwr http://solr:8983/solr/admin/cores?action=STATUS -UseBasicParsing).StatusCode; if ($$statusCode -eq 200) { exit 0 } else { exit 1} } catch { exit 1 }"]
solr-init:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-solr-init:${SITECORE_VERSION}
Expand All @@ -65,7 +84,7 @@ services:
condition: service_healthy
id:
isolation: ${ISOLATION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
image: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${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
Expand All @@ -76,10 +95,10 @@ services:
Sitecore_Sitecore__IdentityServer__CertificateRawDataPassword: ${SITECORE_ID_CERTIFICATE_PASSWORD}
Sitecore_License: ${SITECORE_LICENSE}
healthcheck:
test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
test: ["CMD", "pwsh", "-command", "C:/Healthchecks/Healthcheck.ps1"]
timeout: 300s
depends_on:
mssql:
mssql-init:
condition: service_healthy
labels:
- "traefik.enable=true"
Expand Down
5 changes: 5 additions & 0 deletions examples/helix-basic-unicorn/docker/build/mssql-init/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# escape=`

ARG BASE_IMAGE

FROM ${BASE_IMAGE}
1 change: 0 additions & 1 deletion ...x-basic-unicorn/src/Feature/Navigation/tests/BasicCompany.Feature.Navigation.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
<PackageReference Include="Moq" />
<PackageReference Include="Sitecore.ContentSearch.ContentExtraction" />
<PackageReference Include="Sitecore.FakeDb" />
<PackageReference Include="Sitecore.Nexus" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
1 change: 0 additions & 1 deletion ...helix-basic-unicorn/src/Feature/Products/tests/BasicCompany.Feature.Products.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
<PackageReference Include="Moq" />
<PackageReference Include="Sitecore.ContentSearch.ContentExtraction" />
<PackageReference Include="Sitecore.FakeDb" />
<PackageReference Include="Sitecore.Nexus" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
0 .../Unicorn/Unicorn.DataProvider.10.1.config → .../Unicorn/Unicorn.DataProvider.10.2.config
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...unicorn/src/Foundation/Serialization/website/BasicCompany.Foundation.Serialization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<Content Include="App_Config\Include\Foundation\Foundation.Serialization.config" />
</ItemGroup>
<ItemGroup>
<Content Include="App_Config\Include\Unicorn\Unicorn.DataProvider.10.1.config" />
<Content Include="App_Config\Include\Unicorn\Unicorn.DataProvider.config.disabled" />
<Content Include="App_Config\Include\Unicorn\Unicorn.DataProvider.10.2.config" />
<None Include="App_Config\Layers.config.xdt" />
<None Include="web.config" />
<None Include="web.Debug.config">
Expand Down