Merge pull request #9 from Sitecore/feature/sxc-1114

Add SXC Sitecore Commerce Container SDK 10.0.1.60239.1114
Sitecore · Jan 19, 2021 · 0f9a88d · 0f9a88d
2 parents 9e5cc93 + 877783f
commit 0f9a88d
Show file tree

Hide file tree

Showing 23 changed files with 127 additions and 53 deletions.
diff --git a/sxc/10.0/k8s-commerce-xc1/cd.yaml b/sxc/10.0/k8s-commerce-xc1/cd.yaml
@@ -158,6 +158,11 @@ spec:
             secretKeyRef:
               name: sitecore-redis
               key: sitecore-redis-connection-string.txt
+        - name: SOLR_CORE_PREFIX_NAME
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-solr
+              key: sitecore-solr-core-prefix-name.txt
         - name: Sitecore_Identity_Server_Authority
           value: https://id.globalhost
         - name: Sitecore_Identity_Server_InternalAuthority

diff --git a/sxc/10.0/k8s-commerce-xc1/cm.yaml b/sxc/10.0/k8s-commerce-xc1/cm.yaml
@@ -242,6 +242,11 @@ spec:
           value: http://id
         - name: Sitecore_Identity_Server_Require_Https
           value: "false"
+        - name: SOLR_CORE_PREFIX_NAME
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-solr
+              key: sitecore-solr-core-prefix-name.txt
         - name: Sitecore_xc_Minions_Url
           value: http://engine-minions:5000/commerceops/
         - name: Sitecore_xc_Ops_Url

diff --git a/sxc/10.0/k8s-commerce-xc1/engine-authoring.yaml b/sxc/10.0/k8s-commerce-xc1/engine-authoring.yaml
@@ -38,6 +38,11 @@ spec:
             secretKeyRef:
               name: sitecore-database
               key: sitecore-databaseservername.txt
+        - name: SOLR_CORE_PREFIX_NAME
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-solr
+              key: sitecore-solr-core-prefix-name.txt
         - name: COMMERCEENGINE_AppSettings__DeploymentId
           valueFrom:
             fieldRef:
@@ -147,9 +152,9 @@ spec:
         - name: COMMERCEENGINE_IsSolrCloud
           value: "true"
         - name: COMMERCEENGINE_StorefrontIndexPrefix_web_index
-          value: sitecore_web_index
+          value: $(SOLR_CORE_PREFIX_NAME)_web_index
         - name: COMMERCEENGINE_StorefrontIndexPrefix_master_index
-          value: sitecore_master_index
+          value: $(SOLR_CORE_PREFIX_NAME)_master_index
         - name: COMMERCEENGINE_SearchIndexPrefixOrdersScope
           value: commerce_OrdersScope
         - name: COMMERCEENGINE_SearchIndexPrefixOrdersScope-Rebuild

diff --git a/sxc/10.0/k8s-commerce-xc1/engine-minions.yaml b/sxc/10.0/k8s-commerce-xc1/engine-minions.yaml
@@ -38,6 +38,11 @@ spec:
             secretKeyRef:
               name: sitecore-database
               key: sitecore-databaseservername.txt
+        - name: SOLR_CORE_PREFIX_NAME
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-solr
+              key: sitecore-solr-core-prefix-name.txt
         - name: COMMERCEENGINE_AppSettings__DeploymentId
           valueFrom:
             fieldRef:
@@ -147,9 +152,9 @@ spec:
         - name: COMMERCEENGINE_IsSolrCloud
           value: "true"
         - name: COMMERCEENGINE_StorefrontIndexPrefix_web_index
-          value: sitecore_web_index
+          value: $(SOLR_CORE_PREFIX_NAME)_web_index
         - name: COMMERCEENGINE_StorefrontIndexPrefix_master_index
-          value: sitecore_master_index
+          value: $(SOLR_CORE_PREFIX_NAME)_master_index
         - name: COMMERCEENGINE_SearchIndexPrefixOrdersScope
           value: commerce_OrdersScope
         - name: COMMERCEENGINE_SearchIndexPrefixOrdersScope-Rebuild

diff --git a/sxc/10.0/k8s-commerce-xc1/engine-ops.yaml b/sxc/10.0/k8s-commerce-xc1/engine-ops.yaml
@@ -38,6 +38,11 @@ spec:
             secretKeyRef:
               name: sitecore-database
               key: sitecore-databaseservername.txt
+        - name: SOLR_CORE_PREFIX_NAME
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-solr
+              key: sitecore-solr-core-prefix-name.txt
         - name: COMMERCEENGINE_AppSettings__DeploymentId
           valueFrom:
             fieldRef:
@@ -147,9 +152,9 @@ spec:
         - name: COMMERCEENGINE_IsSolrCloud
           value: "true"
         - name: COMMERCEENGINE_StorefrontIndexPrefix_web_index
-          value: sitecore_web_index
+          value: $(SOLR_CORE_PREFIX_NAME)_web_index
         - name: COMMERCEENGINE_StorefrontIndexPrefix_master_index
-          value: sitecore_master_index
+          value: $(SOLR_CORE_PREFIX_NAME)_master_index
         - name: COMMERCEENGINE_SearchIndexPrefixOrdersScope
           value: commerce_OrdersScope
         - name: COMMERCEENGINE_SearchIndexPrefixOrdersScope-Rebuild

diff --git a/sxc/10.0/k8s-commerce-xc1/engine-shops.yaml b/sxc/10.0/k8s-commerce-xc1/engine-shops.yaml
@@ -38,6 +38,11 @@ spec:
             secretKeyRef:
               name: sitecore-database
               key: sitecore-databaseservername.txt
+        - name: SOLR_CORE_PREFIX_NAME
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-solr
+              key: sitecore-solr-core-prefix-name.txt
         - name: COMMERCEENGINE_AppSettings__DeploymentId
           valueFrom:
             fieldRef:
@@ -147,9 +152,9 @@ spec:
         - name: COMMERCEENGINE_IsSolrCloud
           value: "true"
         - name: COMMERCEENGINE_StorefrontIndexPrefix_web_index
-          value: sitecore_web_index
+          value: $(SOLR_CORE_PREFIX_NAME)_web_index
         - name: COMMERCEENGINE_StorefrontIndexPrefix_master_index
-          value: sitecore_master_index
+          value: $(SOLR_CORE_PREFIX_NAME)_master_index
         - name: COMMERCEENGINE_SearchIndexPrefixOrdersScope
           value: commerce_OrdersScope
         - name: COMMERCEENGINE_SearchIndexPrefixOrdersScope-Rebuild

diff --git a/sxc/10.0/k8s-commerce-xc1/ingress-nginx/ingress.yaml b/sxc/10.0/k8s-commerce-xc1/ingress-nginx/ingress.yaml
@@ -3,11 +3,13 @@ kind: Ingress
 metadata:
   name: sitecore-ingress
   annotations:
-    nginx.ingress.kubernetes.io/affinity: "cookie"
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
+    nginx.ingress.kubernetes.io/affinity: "cookie"
+    nginx.ingress.kubernetes.io/rewrite-target: /
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: "600"
     nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
-    nginx.ingress.kubernetes.io/rewrite-target: /
+    nginx.ingress.kubernetes.io/proxy-body-size: "512m"
 spec:
   rules:
   - host: cd.globalhost

diff --git a/sxc/10.0/k8s-commerce-xc1/init/solr-init.yaml b/sxc/10.0/k8s-commerce-xc1/init/solr-init.yaml
@@ -16,6 +16,11 @@ spec:
             secretKeyRef:
               name: sitecore-solr
               key: sitecore-solr-connection-string.txt
+        - name: SOLR_CORE_PREFIX_NAME
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-solr
+              key: sitecore-solr-core-prefix-name.txt
         - name: COMMERCE_SOLR_CONNECTION_STRING
           valueFrom:
             secretKeyRef:

diff --git a/sxc/10.0/k8s-commerce-xc1/secrets/kustomization.yaml b/sxc/10.0/k8s-commerce-xc1/secrets/kustomization.yaml
@@ -60,6 +60,7 @@ secretGenerator:
 - name: sitecore-solr
   files:
   - xp/sitecore-solr-connection-string.txt
+  - xp/sitecore-solr-core-prefix-name.txt
 - name: sitecore-solr-xdb
   files:
   - xp/sitecore-solr-connection-string-xdb.txt

diff --git a/sxc/10.0/k8s-commerce-xc1/secrets/xp/sitecore-solr-core-prefix-name.txt b/sxc/10.0/k8s-commerce-xc1/secrets/xp/sitecore-solr-core-prefix-name.txt
@@ -0,0 +1 @@
+sitecore
diff --git a/sxc/10.0/scripts/config2004.json b/sxc/10.0/scripts/config2004.json
@@ -1,7 +1,7 @@
 {
-    "shorttag":  "10.0.0-2004",
-    "sxptag":  "10.0.0-2004",
-    "customercommercetag":  "10.0.0-2004",
+    "shorttag":  "10.0-2004",
+    "sxptag":  "10.0-2004",
+    "customercommercetag":  "10.0-2004",
     "spetag":  "6.1.1.205-10.0.17763.1339-1809",
     "sxatag":  "10.0.0.3138.205-10.0.17763.1339-1809",
     "scrdockerregistry":  "scr.sitecore.com",
@@ -10,6 +10,6 @@
     "baseproject":  "base",
     "modulesproject":  "modules",
     "nonproductionproject":  "nonproduction",
-    "nonproductiontag":  "10.0.0-ltsc2019",
+    "nonproductiontag":  "10.0-ltsc2019",
     "os_image_tag":  "2004"
 }
diff --git a/sxc/10.0/scripts/config2009.json b/sxc/10.0/scripts/config2009.json
@@ -1,7 +1,7 @@
 {
-    "shorttag":  "10.0.0-2009",
-    "sxptag":  "10.0.0-2009",
-    "customercommercetag":  "10.0.0-2009",
+    "shorttag":  "10.0-2009",
+    "sxptag":  "10.0-2009",
+    "customercommercetag":  "10.0-2009",
     "spetag":  "6.1.1.205-10.0.17763.1339-1809",
     "sxatag":  "10.0.0.3138.205-10.0.17763.1339-1809",
     "scrdockerregistry":  "scr.sitecore.com",
@@ -10,6 +10,6 @@
     "baseproject":  "base",
     "modulesproject":  "modules",
     "nonproductionproject":  "nonproduction",
-    "nonproductiontag":  "10.0.0-ltsc2019",
+    "nonproductiontag":  "10.0-ltsc2019",
     "os_image_tag":  "2009"
 }
diff --git a/sxc/10.0/scripts/configltsc2019.json b/sxc/10.0/scripts/configltsc2019.json
@@ -1,7 +1,7 @@
 {    
-    "shorttag":  "10.0.0-ltsc2019",
-    "sxptag":  "10.0.0-ltsc2019",
-    "customercommercetag":  "10.0.0-ltsc2019",
+    "shorttag":  "10.0-ltsc2019",
+    "sxptag":  "10.0-ltsc2019",
+    "customercommercetag":  "10.0-ltsc2019",
     "spetag":  "6.1.1.205-10.0.17763.1339-1809",
     "sxatag":  "10.0.0.3138.205-10.0.17763.1339-1809",
     "scrdockerregistry":  "scr.sitecore.com",
@@ -10,6 +10,6 @@
     "baseproject":  "base",
     "modulesproject":  "modules",
     "nonproductionproject":  "nonproduction",
-    "nonproductiontag":  "10.0.0-ltsc2019",
+    "nonproductiontag":  "10.0-ltsc2019",
     "os_image_tag":  "ltsc2019"
 }
diff --git a/sxc/10.0/xc-common/.env b/sxc/10.0/xc-common/.env
@@ -1,5 +1,5 @@
 BASE_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/base/
 
 XP_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-XP_SITECORE_TAG=10.0.0-ltsc2019
+XP_SITECORE_TAG=10.0-ltsc2019
 OS_IMAGE_TAG=ltsc2019
diff --git a/sxc/10.0/xc0/.env b/sxc/10.0/xc0/.env
@@ -1,11 +1,11 @@
 BASE_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/base/
 
 XP_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-XP_SITECORE_TAG=10.0.0-ltsc2019
+XP_SITECORE_TAG=10.0-ltsc2019
 
 XC_NONPRODUCTION_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxc/nonproduction/
 XC_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxc/
-XC_PACKAGES_TAG=10.0.0-ltsc2019
+XC_PACKAGES_TAG=10.0-ltsc2019
 
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=default
@@ -27,6 +27,7 @@ SITECORE_ADMIN_PASSWORD=Password12345
 
 SITECORE_MASTER_DB=Sitecore.Master
 SITECORE_CORE_DB=Sitecore.Core
+SOLR_CORE_PREFIX_NAME=sitecore
 XC_GLOBAL_DB=SitecoreCommerce_Global
 XC_GLOBAL_DB_TRUSTED_CONNECTION=false
 XC_SHARED_DB=SitecoreCommerce_SharedEnvironments

diff --git a/sxc/10.0/xc0/docker-compose.yml b/sxc/10.0/xc0/docker-compose.yml
@@ -125,6 +125,7 @@ services:
       Sitecore_Identity_Server_InternalAuthority: http://id
       Sitecore_Identity_Server_CallbackAuthority: https://${CM_HOST}
       Sitecore_Identity_Server_Require_Https: "false"
+      SOLR_CORE_PREFIX_NAME: ${SOLR_CORE_PREFIX_NAME}
       Sitecore_xc_Shops_Url: http://engine-authoring:5000/api/
       Sitecore_xc_Ops_Url: http://engine-ops:5000/commerceops/
       Sitecore_xc_Minions_Url: http://engine-minions:5000/commerceops/
@@ -162,7 +163,7 @@ services:
       Sitecore_ConnectionStrings_Xdb.Processing.Pools: Data Source=mssql;Initial Catalog=Sitecore.Processing.pools;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Xdb.Referencedata: Data Source=mssql;Initial Catalog=Sitecore.Referencedata;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Collection: Data Source=mssql;Initial Catalog=Sitecore.Xdb.Collection.ShardMapManager;User ID=sa;Password=${SQL_SA_PASSWORD}
-      Sitecore_ConnectionStrings_SolrCore: http://solr:8983/solr/sitecore_xdb
+      Sitecore_ConnectionStrings_SolrCore: http://solr:8983/solr/${SOLR_CORE_PREFIX_NAME}_xdb
       Sitecore_Sitecore:XConnect:CollectionSearch:Services:Solr.SolrReaderSettings:Options:RequireHttps: 'false'
       Sitecore_Sitecore:XConnect:CollectionSearch:Services:XConnectSolrHealthCheckServicesConfiguration:Options:RequireHttps: 'false'
       Sitecore_Sitecore:XConnect:SearchIndexer:Services:Solr.SolrReaderSettings:Options:RequireHttps: 'false'
@@ -181,7 +182,7 @@ services:
     restart: unless-stopped
     environment:
       Sitecore_ConnectionStrings_Collection: Data Source=mssql;Initial Catalog=Sitecore.Xdb.Collection.ShardMapManager;User ID=sa;Password=${SQL_SA_PASSWORD}
-      Sitecore_ConnectionStrings_SolrCore: http://solr:8983/solr/sitecore_xdb
+      Sitecore_ConnectionStrings_SolrCore: http://solr:8983/solr/${SOLR_CORE_PREFIX_NAME}_xdb
       Sitecore_License: ${SITECORE_LICENSE}
       Sitecore_Sitecore:XConnect:SearchIndexer:Services:Solr.SolrReaderSettings:Options:RequireHttps: 'false'
       Sitecore_Sitecore:XConnect:SearchIndexer:Services:Solr.SolrWriterSettings:Options:RequireHttps: 'false'
@@ -299,8 +300,8 @@ services:
       COMMERCEENGINE_SitecoreExternalHost: ${CM_HOST}
       COMMERCEENGINE_SolrUrl: http://solr:8983/solr
       COMMERCEENGINE_IsSolrCloud: "false"
-      COMMERCEENGINE_StorefrontIndexPrefix_web_index: sitecore_web_index
-      COMMERCEENGINE_StorefrontIndexPrefix_master_index: sitecore_master_index
+      COMMERCEENGINE_StorefrontIndexPrefix_web_index: ${SOLR_CORE_PREFIX_NAME}_web_index
+      COMMERCEENGINE_StorefrontIndexPrefix_master_index: ${SOLR_CORE_PREFIX_NAME}_master_index
       COMMERCEENGINE_SearchIndexPrefixOrdersScope: OrdersScope
       COMMERCEENGINE_SearchIndexPrefixOrdersScope-Rebuild: OrdersScope-Rebuild
       COMMERCEENGINE_SearchIndexPrefixCustomersScope: CustomersScope
@@ -377,8 +378,8 @@ services:
       COMMERCEENGINE_SitecoreExternalHost: ${CM_HOST}
       COMMERCEENGINE_SolrUrl: http://solr:8983/solr
       COMMERCEENGINE_IsSolrCloud: "false"
-      COMMERCEENGINE_StorefrontIndexPrefix_web_index: sitecore_web_index
-      COMMERCEENGINE_StorefrontIndexPrefix_master_index: sitecore_master_index
+      COMMERCEENGINE_StorefrontIndexPrefix_web_index: ${SOLR_CORE_PREFIX_NAME}_web_index
+      COMMERCEENGINE_StorefrontIndexPrefix_master_index: ${SOLR_CORE_PREFIX_NAME}_master_index
       COMMERCEENGINE_SearchIndexPrefixOrdersScope: OrdersScope
       COMMERCEENGINE_SearchIndexPrefixOrdersScope-Rebuild: OrdersScope-Rebuild
       COMMERCEENGINE_SearchIndexPrefixCustomersScope: CustomersScope
@@ -453,8 +454,8 @@ services:
       COMMERCEENGINE_SitecoreExternalHost: ${CM_HOST}
       COMMERCEENGINE_SolrUrl: http://solr:8983/solr
       COMMERCEENGINE_IsSolrCloud: "false"
-      COMMERCEENGINE_StorefrontIndexPrefix_web_index: sitecore_web_index
-      COMMERCEENGINE_StorefrontIndexPrefix_master_index: sitecore_master_index
+      COMMERCEENGINE_StorefrontIndexPrefix_web_index: ${SOLR_CORE_PREFIX_NAME}_web_index
+      COMMERCEENGINE_StorefrontIndexPrefix_master_index: ${SOLR_CORE_PREFIX_NAME}_master_index
       COMMERCEENGINE_SearchIndexPrefixOrdersScope: OrdersScope
       COMMERCEENGINE_SearchIndexPrefixOrdersScope-Rebuild: OrdersScope-Rebuild
       COMMERCEENGINE_SearchIndexPrefixCustomersScope: CustomersScope
@@ -529,8 +530,8 @@ services:
       COMMERCEENGINE_SitecoreExternalHost: ${CM_HOST}
       COMMERCEENGINE_SolrUrl: http://solr:8983/solr
       COMMERCEENGINE_IsSolrCloud: "false"
-      COMMERCEENGINE_StorefrontIndexPrefix_web_index: sitecore_web_index
-      COMMERCEENGINE_StorefrontIndexPrefix_master_index: sitecore_master_index
+      COMMERCEENGINE_StorefrontIndexPrefix_web_index: ${SOLR_CORE_PREFIX_NAME}_web_index
+      COMMERCEENGINE_StorefrontIndexPrefix_master_index: ${SOLR_CORE_PREFIX_NAME}_master_index
       COMMERCEENGINE_SearchIndexPrefixOrdersScope: OrdersScope
       COMMERCEENGINE_SearchIndexPrefixOrdersScope-Rebuild: OrdersScope-Rebuild
       COMMERCEENGINE_SearchIndexPrefixCustomersScope: CustomersScope

diff --git a/sxc/10.0/xc1-cxa/.env b/sxc/10.0/xc1-cxa/.env
@@ -1,15 +1,15 @@
 BASE_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/base/
 
 XP_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
-XP_SITECORE_TAG=10.0.0-ltsc2019
+XP_SITECORE_TAG=10.0-ltsc2019
 
 MODULES_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/modules/
 SPE_SITECORE_TAG=6.1.1-1809
 SXA_SITECORE_TAG=10.0.0-1809
 
 XC_NONPRODUCTION_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxc/nonproduction/
 XC_SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxc/
-XC_PACKAGES_TAG=10.0.0-ltsc2019
+XC_PACKAGES_TAG=10.0-ltsc2019
 
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 TRAEFIK_ISOLATION=default
@@ -32,6 +32,7 @@ SITECORE_ADMIN_PASSWORD=Password12345
 
 SITECORE_MASTER_DB=Sitecore.Master
 SITECORE_CORE_DB=Sitecore.Core
+SOLR_CORE_PREFIX_NAME=sitecore
 XC_GLOBAL_DB=SitecoreCommerce_Global
 XC_GLOBAL_DB_TRUSTED_CONNECTION=false
 XC_SHARED_DB=SitecoreCommerce_SharedEnvironments

diff --git a/...d/Content/Website/App_Config/Include/Sitecore.Commerce.XA.CustomSolrCorePrefixName.config b/...d/Content/Website/App_Config/Include/Sitecore.Commerce.XA.CustomSolrCorePrefixName.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:search="http://www.sitecore.net/xmlconfig/search/">
+  <sitecore search:require="solr">
+    <contentSearch>
+      <configuration type="Sitecore.ContentSearch.ContentSearchConfiguration, Sitecore.ContentSearch">
+        <indexes hint="list:AddIndex">
+          <index id="sitecore_sxa_web_index" type="Sitecore.ContentSearch.SolrProvider.SolrSearchIndex, Sitecore.ContentSearch.SolrProvider">
+            <param desc="core" patch:instead="param[@desc='core']">$(env:SOLR_CORE_PREFIX_NAME)_sxa_web_index</param>
+          </index>
+        </indexes>
+      </configuration>
+    </contentSearch>
+  </sitecore>
+</configuration>
diff --git a/sxc/10.0/xc1-cxa/cd/Dockerfile b/sxc/10.0/xc1-cxa/cd/Dockerfile
@@ -12,7 +12,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 COPY --from=sxa_resources C:\module\cd\content C:\inetpub\wwwroot
 COPY --from=sxa_resources C:\module\tools C:\module\tools
 
-COPY wdp/ C:/inetpub/wwwroot
+COPY Content/Website/ wdp/ C:/inetpub/wwwroot/
 COPY xdts/ C:/inetpub/wwwroot/App_Data/SxaXdt
 
 RUN C:\module\tools\Initialize-Content.ps1 -TargetPath C:\inetpub\wwwroot; `

diff --git a/...m/Content/Website/App_Config/Include/Sitecore.Commerce.XA.CustomSolrCorePrefixName.config b/...m/Content/Website/App_Config/Include/Sitecore.Commerce.XA.CustomSolrCorePrefixName.config
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:search="http://www.sitecore.net/xmlconfig/search/">
+  <sitecore search:require="solr">
+    <contentSearch>
+      <configuration type="Sitecore.ContentSearch.ContentSearchConfiguration, Sitecore.ContentSearch">
+        <indexes hint="list:AddIndex">
+          <index id="sitecore_sxa_web_index" type="Sitecore.ContentSearch.SolrProvider.SolrSearchIndex, Sitecore.ContentSearch.SolrProvider">
+            <param desc="core" patch:instead="param[@desc='core']">$(env:SOLR_CORE_PREFIX_NAME)_sxa_web_index</param>
+          </index>
+          <index id="sitecore_sxa_master_index" type="Sitecore.ContentSearch.SolrProvider.SolrSearchIndex, Sitecore.ContentSearch.SolrProvider">
+            <param desc="core" patch:instead="param[@desc='core']">$(env:SOLR_CORE_PREFIX_NAME)_sxa_master_index</param>
+          </index>
+        </indexes>
+      </configuration>
+    </contentSearch>
+  </sitecore>
+</configuration>
diff --git a/sxc/10.0/xc1-cxa/cm/Dockerfile b/sxc/10.0/xc1-cxa/cm/Dockerfile
@@ -19,7 +19,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 COPY --from=sxa_resources C:\module\cm\content C:\inetpub\wwwroot
 COPY --from=sxa_resources C:\module\tools C:\module\tools
 
-COPY wdp/ C:/inetpub/wwwroot
+COPY Content/Website/ wdp/ C:/inetpub/wwwroot/
 COPY xdts/ C:/inetpub/wwwroot/App_Data/SxaXdt
 
 RUN C:\module\tools\Initialize-Content.ps1 -TargetPath C:\inetpub\wwwroot; `