From 578d583b98a623b9dc53319744fc691ae0a4c94d Mon Sep 17 00:00:00 2001 From: Alexander Doroshenko Date: Tue, 7 Nov 2023 20:35:55 +0000 Subject: [PATCH] Merged PR 4909: Updated cumulative hotfix and fixed 10.3.1 base version Updated cumulative hotfix and fixed 10.3.1 base version Related work items: #9082 --- .env | 2 +- docker-compose-xp1.build.yml | 4 ++-- docker-compose.build.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 40d714cfa..b189114e0 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ COMPOSE_PROJECT_NAME=sitecore-xp0 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/ -SITECORE_VERSION=10.3 +SITECORE_VERSION=10.3.1 SITECORE_ADMIN_PASSWORD=b SQL_SERVER=mssql diff --git a/docker-compose-xp1.build.yml b/docker-compose-xp1.build.yml index cd441f60a..c5c6e95b2 100644 --- a/docker-compose-xp1.build.yml +++ b/docker-compose-xp1.build.yml @@ -35,7 +35,7 @@ services: HEADLESS_ASSETS: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-headless-services-xp1-assets:21.0-${SITECORE_ASSET_NANOSERVER_VERSION} CMP_ASSETS: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-chub-assets:5.0.0-${SITECORE_ASSET_NANOSERVER_VERSION} TOOLS_ASSETS: ${SITECORE_DOCKER_REGISTRY}tools/sitecore-docker-tools-assets:${TOOLS_VERSION}-${SITECORE_ASSET_NANOSERVER_VERSION} - DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xp1-assets:10.3.1.009332.420-10.0.17763.4377-1809 + DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xp1-assets:10.3.2.009809.492-10.0.17763.4851-1809 depends_on: - solution cm: @@ -52,7 +52,7 @@ services: XGEN_ASSETS: adoprog/custom-xgenerator-assets:10.1-${NANOSERVER_VERSION} SOLUTION_IMAGE: ${REGISTRY}build/lighthouse-solution:${SITECORE_VERSION}-${NANOSERVER_VERSION}-${SOLUTION_VERSION} MANAGEMENT_SERVICES_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-management-services-xm1-assets:5.1-${SITECORE_ASSET_NANOSERVER_VERSION} - DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xp1-assets:10.3.1.009332.420-10.0.17763.4377-1809 + DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xp1-assets:10.3.2.009809.492-10.0.17763.4851-1809 depends_on: - solution diff --git a/docker-compose.build.yml b/docker-compose.build.yml index 0f1d61052..dc18b494d 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -59,7 +59,7 @@ services: XGEN_ASSETS: adoprog/custom-xgenerator-assets:10.1-${NANOSERVER_VERSION} SOLUTION_IMAGE: ${REGISTRY}build/lighthouse-solution:${SITECORE_VERSION}-${NANOSERVER_VERSION}-${SOLUTION_VERSION} MANAGEMENT_SERVICES_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-management-services-xm1-assets:5.1-${SITECORE_ASSET_NANOSERVER_VERSION} - DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xp1-assets:10.3.1.009332.420-10.0.17763.4377-1809 + DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xp1-assets:10.3.2.009809.492-10.0.17763.4851-1809 depends_on: - solution @@ -76,7 +76,7 @@ services: HEADLESS_ASSETS: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-headless-services-xp1-assets:21.0-${SITECORE_ASSET_NANOSERVER_VERSION} CMP_ASSETS: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-chub-assets:5.0.0-${SITECORE_ASSET_NANOSERVER_VERSION} TOOLS_ASSETS: ${SITECORE_DOCKER_REGISTRY}tools/sitecore-docker-tools-assets:${TOOLS_VERSION}-${SITECORE_ASSET_NANOSERVER_VERSION} - DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xp1-assets:10.3.1.009332.420-10.0.17763.4377-1809 + DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xp1-assets:10.3.2.009809.492-10.0.17763.4851-1809 depends_on: - solution