Merge pull request rancher#170 from luthermonson/20h2-patch-v120

luthermonson · web-flow · commit e63892e0c328 · 2021-01-31T13:34:06.000-07:00
adding pwsh symlink
diff --git a/Dockerfile.windows.20H2 b/Dockerfile.windows.20H2
@@ -50,6 +50,7 @@ RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env
 # FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION}
 # USER ContainerAdministrator
 # SHELL ["pwsh.exe", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+RUN New-Item -ItemType SymbolicLink -Target "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" -Path "C:\Windows\System32\WindowsPowerShell\v1.0\pwsh.exe"
 RUN $URL = 'https://github.com/rancher/azure-cli/releases/download/v0.0.2/dist.azure-cli.zip'; \
     \
     Write-Host ('Downloading azure-cli from {0} ...'  -f $URL); \

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env`
`50`	`50`	`# FROM mcr.microsoft.com/powershell:nanoserver-${SERVERCORE_VERSION}`
`51`	`51`	`# USER ContainerAdministrator`
`52`	`52`	`# SHELL ["pwsh.exe", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]`
	`53`	`+RUN New-Item -ItemType SymbolicLink -Target "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" -Path "C:\Windows\System32\WindowsPowerShell\v1.0\pwsh.exe"`
`53`	`54`	`RUN $URL = 'https://github.com/rancher/azure-cli/releases/download/v0.0.2/dist.azure-cli.zip'; \`
`54`	`55`	`\`
`55`	`56`	`Write-Host ('Downloading azure-cli from {0} ...' -f $URL); \`