Merge pull request #126 from Sitecore/feature/sxc-20176

Add SXC Sitecore Commerce Container SDK 10.1.0.70162.20176
Sitecore · Feb 23, 2023 · c66849f · c66849f
2 parents 7284400 + 4f874b8
commit c66849f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 40 deletions.
diff --git a/sxc/10.1/k8s-commerce-xc1/volumes/azurefile/submit-queue.yaml b/sxc/10.1/k8s-commerce-xc1/volumes/azurefile/submit-queue.yaml
@@ -3,7 +3,7 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: submit-queue
-provisioner: kubernetes.io/azure-file
+provisioner: file.csi.azure.com
 parameters:
   skuName: Standard_LRS
 ---

diff --git a/sxc/10.1/k8s-commerce-xc1/volumes/platform-config-storage.yaml b/sxc/10.1/k8s-commerce-xc1/volumes/platform-config-storage.yaml
@@ -2,7 +2,7 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: platform-config-storage
-provisioner: kubernetes.io/azure-file
+provisioner: file.csi.azure.com
 mountOptions:
   - dir_mode=0777
   - file_mode=0777

diff --git a/sxc/10.1/scripts/UpdateEnvTag.ps1 b/sxc/10.1/scripts/UpdateEnvTag.ps1
@@ -89,13 +89,7 @@ if (Test-Path("$jsonFile")) {
         $OS_IMAGE_TAG = "OS_IMAGE_TAG=$($containerConfigInfo.OS_IMAGE_TAG)" 
         $envContent = $envContent -replace "OS_IMAGE_TAG=.*", $OS_IMAGE_TAG
 
-        #Microsoft has not yet update the tags for IIS iamges so we need to continue to use 2009 rather than the 20H2 tag
-        if ($($containerConfigInfo.OS_IMAGE_TAG) -eq '20H2') {
-            $OS_IMAGE_TAG_IIS = "OS_IMAGE_TAG_IIS=2009"
-        } else {
-            $OS_IMAGE_TAG_IIS = "OS_IMAGE_TAG_IIS=$($containerConfigInfo.OS_IMAGE_TAG)" 
-        }
-        write-host "UpdateEnvTag OS_IMAGE_TAG_IIS: $OS_IMAGE_TAG_IIS"
+        $OS_IMAGE_TAG_IIS = "OS_IMAGE_TAG_IIS=$($containerConfigInfo.OS_IMAGE_TAG)" 
         $envContent = $envContent -replace "OS_IMAGE_TAG_IIS=.*", $OS_IMAGE_TAG_IIS
 
         Set-Content -Path $_ -Value $envContent -Force

diff --git a/sxc/10.1/scripts/config2009.json b/sxc/10.1/scripts/config2009.json
diff --git a/sxc/10.1/scripts/config20H2.json b/sxc/10.1/scripts/config20H2.json
diff --git a/sxc/10.1/scripts/readme.md b/sxc/10.1/scripts/readme.md
@@ -42,7 +42,7 @@ This folder contains a set of scripts and json files, provided as examples, to f
 >    }
 > ```
 
-**configltsc20H2.json**, **config2009.json**, and **configltsc2019.json** -> are used by the update scripts <code>UpdateEnvTag.ps1</code>, <code>UpdateEnvCompose.ps1</code> and <code>UpdateK8SYaml.ps1</code> to override or replace tokens defined in the .env and yaml files. This allows the customized files to be used in the build and run processes.
+**configltsc2019.json** -> are used by the update scripts <code>UpdateEnvTag.ps1</code>, <code>UpdateEnvCompose.ps1</code> and <code>UpdateK8SYaml.ps1</code> to override or replace tokens defined in the .env and yaml files. This allows the customized files to be used in the build and run processes.
 
 | Variable        | Value                       | Description                                                  |
 | --------------- | --------------------------- | -------------------------------------------------------------|
@@ -57,6 +57,6 @@ This folder contains a set of scripts and json files, provided as examples, to f
 | modulesproject | modules | Container project name for Sitecore Modules, like Sitecore Experience Accelerator. |
 | nonproductionproject | nonproduction | Container project name for container images that are not for production. Provided MSSQL and Solr container images are *not-production* images. It is expected that customers provide suitable MSSQL and Solr environments for production deployments. |
 | nonproductiontag | 10.1.0-ltsc2019 | Image tag for non-production container images. |
-| os_image_tag | ltsc2019 | Operating System name on which to build and run containers. Valid values are *ltsc2019* and *1909* |
+| os_image_tag | ltsc2019 | Operating System name on which to build and run containers. Valid values are *ltsc2019* |
 
 **FakeLicenseFile.txt** -> this fake license file used as a place holder for the proper location to place the license file to be used by the -licenseFilePath command-line parameter.
diff --git a/sxc/10.1/xc-common/engine/Dockerfile b/sxc/10.1/xc-common/engine/Dockerfile
@@ -19,7 +19,7 @@ COPY --from=resources C:\resources\tools C:\tools
 
 USER ContainerAdministrator
 
-ADD https://download.visualstudio.microsoft.com/download/pr/c8eabe25-bb2b-4089-992e-48198ff72ad8/a55a5313bfb65ac9bd2e5069dd4de5bc/dotnet-hosting-3.1.15-win.exe .\install\dotnet.exe
+ADD https://download.visualstudio.microsoft.com/download/pr/b84cc7e8-5bf7-4e35-bc2a-94903c823b5c/12f4767bded70bcfb4d56b3a6bfa005d/dotnet-hosting-3.1.31-win.exe .\install\dotnet.exe
 
 ENV ASPNETCORE_URLS=http://+:5000 `
     DOTNET_RUNNING_IN_CONTAINER=true `