updates for 10.1 release

Sitecore · Feb 25, 2021 · 669e861 · 669e861
1 parent 2075e67
commit 669e861
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 29 deletions.
diff --git a/examples/helix-basic-nextjs/.env b/examples/helix-basic-nextjs/.env
@@ -9,17 +9,17 @@ RENDERING_HOST=www.basic-company-nextjs.localhost
 
 # Sitecore Docker registry and platform version.
 # The ltsc2019-based images are used by default here. SAC images are also available.
-SITECORE_DOCKER_REGISTRY=do-hrbr-01-dk1.dk.sitecore.net/sxp/
+SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
 SITECORE_VERSION=10.1-ltsc2019
 
 # The sitecore\admin and SQL 'sa' account passwords for this environment are configurable here.
 SITECORE_ADMIN_PASSWORD=
 SQL_SA_PASSWORD=
 
 # Other supporting images, including Sitecore modules and Docker tools
-MANAGEMENT_SERVICES_IMAGE=do-hrbr-01-dk1.dk.sitecore.net/sxp/modules/sitecore-management-services-xp1-assets:3.0.0-1809
-HEADLESS_SERVICES_IMAGE=do-hrbr-01-dk1.dk.sitecore.net/sxp/modules/sitecore-headless-services-xp1-assets:16.0.0-1809
-TOOLS_IMAGE=do-hrbr-01-dk1.dk.sitecore.net/experimental/sitecore-docker-tools-assets:10.1.0-1809-unstable
+MANAGEMENT_SERVICES_IMAGE=scr.sitecore.com/sxp/modules/sitecore-management-services-xp1-assets:3.0.0-1809
+HEADLESS_SERVICES_IMAGE=scr.sitecore.com/sxp/modules/sitecore-headless-services-xp1-assets:16.0.0-1809
+TOOLS_IMAGE=scr.sitecore.com/tools/sitecore-docker-tools-assets:10.1-1809
 TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
 
 # Windows and Node.js version for JSS

diff --git a/examples/helix-basic-nextjs/Dockerfile b/examples/helix-basic-nextjs/Dockerfile
@@ -12,15 +12,13 @@ ARG BUILD_IMAGE
 # https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/docker/building-net-docker-images?view=aspnetcore-3.1#the-dockerfile-1
 FROM ${BUILD_IMAGE} AS nuget-prep
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
 COPY *.sln nuget.config Directory.Build.targets Packages.props /nuget/
 COPY src/ /temp/
 RUN Invoke-Expression 'robocopy C:/temp C:/nuget/src /s /ndl /njh /njs *.csproj *.scproj packages.config'
 
 FROM ${BUILD_IMAGE} AS builder
 ARG BUILD_CONFIGURATION
-ARG NUGET_USER
-ARG NUGET_PASSWORD
-
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 # Ensure updated nuget. Depending on your Windows version, dotnet/framework/sdk:4.8 tag may provide an outdated client.

diff --git a/examples/helix-basic-nextjs/Packages.props b/examples/helix-basic-nextjs/Packages.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PlatformVersion>10.1.0-r*</PlatformVersion>
+    <PlatformVersion>10.1.0</PlatformVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Update="Sitecore.Nexus" Version="$(PlatformVersion)" />
@@ -10,9 +10,9 @@
     <PackageReference Update="Sitecore.ContentSearch" Version="$(PlatformVersion)" />
     <PackageReference Update="Sitecore.ContentSearch.Linq" Version="$(PlatformVersion)" />
     <PackageReference Update="Sitecore.ContentSearch.ContentExtraction" Version="$(PlatformVersion)" />
-    <PackageReference Update="Sitecore.LayoutService" Version="7.0.0-r00165.726" />
+    <PackageReference Update="Sitecore.LayoutService" Version="7.0.0" />
     <PackageReference Update="Sitecore.Assemblies.Platform" Version="$(PlatformVersion)" />
-    <PackageReference Update="Sitecore.Assemblies.SitecoreHeadlessServicesServer" Version="17.0.0-r00426.1370" />
+    <PackageReference Update="Sitecore.Assemblies.SitecoreHeadlessServicesServer" Version="17.0.0" />
     <PackageReference Update="RichardSzalay.Helix.Publishing.WebRoot" Version="1.5.6" />
   </ItemGroup>
 </Project>
diff --git a/examples/helix-basic-nextjs/docker-compose.override.yml b/examples/helix-basic-nextjs/docker-compose.override.yml
@@ -30,8 +30,6 @@ services:
       args:
         BUILD_CONFIGURATION: ${BUILD_CONFIGURATION}
         BUILD_IMAGE: mcr.microsoft.com/dotnet/framework/sdk:4.8
-        NUGET_USER: ${NUGET_USER}
-        NUGET_PASSWORD: ${NUGET_PASSWORD}
     scale: 0
 
   rendering:

diff --git a/examples/helix-basic-nextjs/nuget.config b/examples/helix-basic-nextjs/nuget.config
@@ -3,26 +3,11 @@
   <packageSources>
     <clear />
     <add key="Nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="Sitecore" value="http://nuget1ca2.dk.sitecore.net/nuget/sc_packages_preview/" />
-    <add key="Sitecore2" value="http://nuget1ca2.dk.sitecore.net/nuget/10.1.0_master/" />
+    <add key="Sitecore" value="https://sitecore.myget.org/F/sc-packages/api/v3/index.json" />
+    <add key="SitecoreGallery" value="https://sitecore.myget.org/F/sc-powershell/api/v2" />
   </packageSources>
 
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
   </activePackageSource>
-
-  <packageSourceCredentials>
-    <Sitecore>
-      <add key="Username" value="%NUGET_USER%" />
-      <add key="ClearTextPassword" value="%NUGET_PASSWORD%" />
-    </Sitecore>
-    <Sitecore2>
-      <add key="Username" value="%NUGET_USER%" />
-      <add key="ClearTextPassword" value="%NUGET_PASSWORD%" />
-    </Sitecore2>
-    <SitecoreGallery>
-      <add key="Username" value="%NUGET_USER%" />
-      <add key="ClearTextPassword" value="%NUGET_PASSWORD%" />
-    </SitecoreGallery>
-  </packageSourceCredentials>
 </configuration>