Skip to content

Commit 8a7a2a7

Browse files
committed
Changes done for Sitecore 10.4.0 and LTSC2022
1 parent 1d37cab commit 8a7a2a7

11 files changed

Lines changed: 20 additions & 20 deletions

File tree

GettingStartedSetup/SetupDependecies/run/sitecore-xm1/docker-compose.override.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ services:
7777
build:
7878
context: ../../docker/build/redis
7979
args:
80-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-redis:${SITECORE_VERSION}
80+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX}
8181

8282
# Mount our SQL data folder and use our custom image with the Headless Services (JSS)
8383
# module data added. See Dockerfile for details.
@@ -116,11 +116,11 @@ services:
116116
# Use our retagged Identity Server image.
117117
# Configure for a mounted license file instead of using SITECORE_LICENSE.
118118
id:
119-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id6:${VERSION:-latest}
119+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id7:${VERSION:-latest}
120120
build:
121121
context: ../../docker/build/id
122122
args:
123-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
123+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
124124
volumes:
125125
- ${HOST_LICENSE_FOLDER}:c:\license
126126
environment:

GettingStartedSetup/SetupDependecies/run/sitecore-xp0/docker-compose.override.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ services:
108108
# Use our retagged Identity Server image.
109109
# Configure for a mounted license file instead of using SITECORE_LICENSE.
110110
id:
111-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id6:${VERSION:-latest}
111+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id7:${VERSION:-latest}
112112
build:
113113
context: ../../docker/build/id
114114
args:
115-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
115+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
116116
volumes:
117117
- ${HOST_LICENSE_FOLDER}:c:\license
118118
environment:

GettingStartedSetup/SetupDependecies/run/sitecore-xp1/docker-compose.override.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ services:
7777
build:
7878
context: ../../docker/build/redis
7979
args:
80-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-redis:${SITECORE_VERSION}
80+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX}
8181

8282
# Mount our SQL data folder and use our custom image with the Headless Services (JSS)
8383
# module data added. See Dockerfile for details.
@@ -116,11 +116,11 @@ services:
116116
# Use our retagged Identity Server image.
117117
# Configure for a mounted license file instead of using SITECORE_LICENSE.
118118
id:
119-
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id6:${VERSION:-latest}
119+
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-id7:${VERSION:-latest}
120120
build:
121121
context: ../../docker/build/id
122122
args:
123-
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
123+
PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
124124
volumes:
125125
- ${HOST_LICENSE_FOLDER}:c:\license
126126
environment:

custom-images/.env

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ ID_HOST=id.dockerexamples.localhost
2222
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
2323
SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
2424
SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/
25-
SITECORE_VERSION=10.3.1-ltsc2019
26-
TOOLS_VERSION=10.3.0-1809
27-
SPE_VERSION=6.4.0.65-1809
28-
SXA_VERSION=10.3-1809
29-
EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2019
25+
SITECORE_VERSION=10.4.0-ltsc2022
26+
TOOLS_VERSION=10.3.0-ltsc2022
27+
SPE_VERSION=7.0-ltsc2022
28+
SXA_VERSION=10.4.0-ltsc2022
29+
EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2022
3030

3131
SITECORE_ADMIN_PASSWORD=
3232
REPORTING_API_KEY=

custom-images/Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<PlatformVersion>10.3.0</PlatformVersion>
4+
<PlatformVersion>10.4.0</PlatformVersion>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Update="Sitecore.XConnect" Version="$(PlatformVersion)" />

custom-images/docker-compose.xm1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
image: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX}
3333
mssql:
3434
isolation: ${ISOLATION}
35-
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${EXTERNAL_IMAGE_TAG_SUFFIX}
35+
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX}
3636
environment:
3737
SA_PASSWORD: ${SQL_SA_PASSWORD}
3838
ACCEPT_EULA: "Y"

custom-images/docker-compose.xp1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
image: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX}
3333
mssql:
3434
isolation: ${ISOLATION}
35-
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${EXTERNAL_IMAGE_TAG_SUFFIX}
35+
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX}
3636
environment:
3737
SA_PASSWORD: ${SQL_SA_PASSWORD}
3838
ACCEPT_EULA: "Y"

custom-images/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ services:
2727
condition: service_healthy
2828
mssql:
2929
isolation: ${ISOLATION}
30-
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${EXTERNAL_IMAGE_TAG_SUFFIX}
30+
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX}
3131
environment:
3232
SA_PASSWORD: ${SQL_SA_PASSWORD}
3333
ACCEPT_EULA: "Y"

custom-images/src/DockerExamples.XConnect/App_Data/Models/DockerExamples.XConnect.Model.DemoModel, 1.0.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
{
1010
"Name": "Sitecore.XConnect.Collection.Model",
11-
"Version": "10.3"
11+
"Version": "10.4"
1212
}
1313
],
1414
"Types": {

getting-started/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
COMPOSE_PROJECT_NAME=sitecore-xp0
22
SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
3-
SITECORE_VERSION=10.3-ltsc2022
3+
SITECORE_VERSION=10.4.0-ltsc2022
44
SITECORE_ADMIN_PASSWORD=
55
SQL_SA_PASSWORD=
66
TELERIK_ENCRYPTION_KEY=

0 commit comments

Comments
 (0)