diff --git a/custom-images/.env b/custom-images/.env index f373e31..cd3b1bb 100644 --- a/custom-images/.env +++ b/custom-images/.env @@ -22,10 +22,10 @@ ID_HOST=id.dockerexamples.localhost SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/ SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/ SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/ -SITECORE_VERSION=10.3.1-ltsc2019 +SITECORE_VERSION=10.4-ltsc2019 TOOLS_VERSION=10.3.0-1809 -SPE_VERSION=6.4.0.65-1809 -SXA_VERSION=10.3-1809 +SPE_VERSION=7.0.0-1809 +SXA_VERSION=10.4-1809 EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2019 SITECORE_ADMIN_PASSWORD= diff --git a/custom-images/Packages.props b/custom-images/Packages.props index 73af58b..f635bbf 100644 --- a/custom-images/Packages.props +++ b/custom-images/Packages.props @@ -1,7 +1,7 @@ - 10.3.0 + 10.4.0 diff --git a/custom-images/docker-compose.xm1.yml b/custom-images/docker-compose.xm1.yml index e8f7489..fa2fba2 100644 --- a/custom-images/docker-compose.xm1.yml +++ b/custom-images/docker-compose.xm1.yml @@ -32,7 +32,7 @@ services: image: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX} mssql: isolation: ${ISOLATION} - image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${EXTERNAL_IMAGE_TAG_SUFFIX} + image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX} environment: SA_PASSWORD: ${SQL_SA_PASSWORD} ACCEPT_EULA: "Y" diff --git a/custom-images/docker-compose.xp1.yml b/custom-images/docker-compose.xp1.yml index ce2fc95..e981c7f 100644 --- a/custom-images/docker-compose.xp1.yml +++ b/custom-images/docker-compose.xp1.yml @@ -32,7 +32,7 @@ services: image: ${SITECORE_DOCKER_REGISTRY}redis:3.2.100-${EXTERNAL_IMAGE_TAG_SUFFIX} mssql: isolation: ${ISOLATION} - image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${EXTERNAL_IMAGE_TAG_SUFFIX} + image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX} environment: SA_PASSWORD: ${SQL_SA_PASSWORD} ACCEPT_EULA: "Y" diff --git a/custom-images/docker-compose.yml b/custom-images/docker-compose.yml index ea5f117..602b1f7 100644 --- a/custom-images/docker-compose.yml +++ b/custom-images/docker-compose.yml @@ -27,7 +27,7 @@ services: condition: service_healthy mssql: isolation: ${ISOLATION} - image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${EXTERNAL_IMAGE_TAG_SUFFIX} + image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX} environment: SA_PASSWORD: ${SQL_SA_PASSWORD} ACCEPT_EULA: "Y" diff --git a/custom-images/src/DockerExamples.XConnect/App_Data/Models/DockerExamples.XConnect.Model.DemoModel, 1.0.json b/custom-images/src/DockerExamples.XConnect/App_Data/Models/DockerExamples.XConnect.Model.DemoModel, 1.0.json index 36d4dea..6fc9304 100644 --- a/custom-images/src/DockerExamples.XConnect/App_Data/Models/DockerExamples.XConnect.Model.DemoModel, 1.0.json +++ b/custom-images/src/DockerExamples.XConnect/App_Data/Models/DockerExamples.XConnect.Model.DemoModel, 1.0.json @@ -8,7 +8,7 @@ }, { "Name": "Sitecore.XConnect.Collection.Model", - "Version": "10.3" + "Version": "10.4" } ], "Types": { diff --git a/getting-started/.env b/getting-started/.env index c13815a..bffc5f0 100644 --- a/getting-started/.env +++ b/getting-started/.env @@ -1,6 +1,6 @@ COMPOSE_PROJECT_NAME=sitecore-xp0 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/ -SITECORE_VERSION=10.3-ltsc2022 +SITECORE_VERSION=10.4-ltsc2022 SITECORE_ADMIN_PASSWORD= SQL_SA_PASSWORD= TELERIK_ENCRYPTION_KEY= diff --git a/getting-started/docker-compose.yml b/getting-started/docker-compose.yml index 87c052b..8a201d1 100644 --- a/getting-started/docker-compose.yml +++ b/getting-started/docker-compose.yml @@ -27,7 +27,7 @@ services: condition: service_healthy mssql: isolation: ${ISOLATION} - image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2017-${EXTERNAL_IMAGE_TAG_SUFFIX} + image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX} environment: SA_PASSWORD: ${SQL_SA_PASSWORD} ACCEPT_EULA: "Y"