From 669e861ad49cdfc4d4c8df4bde9de43d68fd5c71 Mon Sep 17 00:00:00 2001
From: Nick Wesselman <27013789+nickwesselman@users.noreply.github.com>
Date: Thu, 25 Feb 2021 16:37:16 -0500
Subject: [PATCH] updates for 10.1 release
---
examples/helix-basic-nextjs/.env | 8 ++++----
examples/helix-basic-nextjs/Dockerfile | 4 +---
examples/helix-basic-nextjs/Packages.props | 6 +++---
.../docker-compose.override.yml | 2 --
examples/helix-basic-nextjs/nuget.config | 19 ++-----------------
5 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/examples/helix-basic-nextjs/.env b/examples/helix-basic-nextjs/.env
index c8a62a50..2228dace 100644
--- a/examples/helix-basic-nextjs/.env
+++ b/examples/helix-basic-nextjs/.env
@@ -9,7 +9,7 @@ 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.
@@ -17,9 +17,9 @@ 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
index 4b2e919d..a32ff2cd 100644
--- 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
index 4256ccc7..d1b34ee9 100644
--- a/examples/helix-basic-nextjs/Packages.props
+++ b/examples/helix-basic-nextjs/Packages.props
@@ -1,7 +1,7 @@
- 10.1.0-r*
+ 10.1.0
@@ -10,9 +10,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/examples/helix-basic-nextjs/docker-compose.override.yml b/examples/helix-basic-nextjs/docker-compose.override.yml
index 31a4157c..edd94b47 100644
--- 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
index 203432e1..95d95c53 100644
--- a/examples/helix-basic-nextjs/nuget.config
+++ b/examples/helix-basic-nextjs/nuget.config
@@ -3,26 +3,11 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-