From 44da4fd2b24edaa209fb30df0a91d677f1e091d4 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Fri, 13 Aug 2021 11:21:58 -0400 Subject: [PATCH 01/16] update stable nanoserver2022 image to pull from new windows LTSC2022 release location --- release/stable/nanoserver2022/docker/Dockerfile | 4 +++- release/stable/nanoserver2022/meta.json | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile index 0ad72445d..374025e48 100644 --- a/release/stable/nanoserver2022/docker/Dockerfile +++ b/release/stable/nanoserver2022/docker/Dockerfile @@ -6,9 +6,11 @@ ARG InstallerVersion=nanoserver ARG dockerHost=mcr.microsoft.com ARG InstallerRepo=mcr.microsoft.com/powershell -ARG NanoServerRepo=windows/nanoserver +ARG NanoServerRepo=windows/server ARG tag=ltsc2022 +#mcr.microsoft.com/windows/server:ltsc2022 + # Use server core as an installer container to extract PowerShell, # As this is a multi-stage build, this stage will eventually be thrown away FROM ${InstallerRepo}:$InstallerVersion AS installer-env diff --git a/release/stable/nanoserver2022/meta.json b/release/stable/nanoserver2022/meta.json index 5fb0dab18..7dd344aaa 100644 --- a/release/stable/nanoserver2022/meta.json +++ b/release/stable/nanoserver2022/meta.json @@ -19,6 +19,5 @@ "TestProperties": { "size": 1 }, - "UseAcr": true, - "IsPrivate": true + "UseAcr": true } From fa1422dec4caf4ec743388c8225b1d4a977f67d5 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Fri, 13 Aug 2021 11:28:16 -0400 Subject: [PATCH 02/16] for windows 2022 release, prepare windowsservercore image to be public --- release/stable/nanoserver2022/docker/Dockerfile | 2 -- release/stable/windowsservercore2022/meta.json | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile index 374025e48..2215cef69 100644 --- a/release/stable/nanoserver2022/docker/Dockerfile +++ b/release/stable/nanoserver2022/docker/Dockerfile @@ -9,8 +9,6 @@ ARG InstallerRepo=mcr.microsoft.com/powershell ARG NanoServerRepo=windows/server ARG tag=ltsc2022 -#mcr.microsoft.com/windows/server:ltsc2022 - # Use server core as an installer container to extract PowerShell, # As this is a multi-stage build, this stage will eventually be thrown away FROM ${InstallerRepo}:$InstallerVersion AS installer-env diff --git a/release/stable/windowsservercore2022/meta.json b/release/stable/windowsservercore2022/meta.json index d3335f497..1cc0b0a7f 100644 --- a/release/stable/windowsservercore2022/meta.json +++ b/release/stable/windowsservercore2022/meta.json @@ -19,6 +19,5 @@ "TestProperties": { "size": 1 }, - "UseAcr": true, - "IsPrivate": true + "UseAcr": true } From 00e0860cb88cf5877b2ea39b9f8c42f734816b1a Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Fri, 13 Aug 2021 11:32:19 -0400 Subject: [PATCH 03/16] change from location for nanoserver and make images public for windows LTSC2022 release --- release/lts/nanoserver2022/docker/Dockerfile | 2 +- release/lts/nanoserver2022/meta.json | 3 +-- release/lts/windowsservercore2022/meta.json | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile index 0ad72445d..2215cef69 100644 --- a/release/lts/nanoserver2022/docker/Dockerfile +++ b/release/lts/nanoserver2022/docker/Dockerfile @@ -6,7 +6,7 @@ ARG InstallerVersion=nanoserver ARG dockerHost=mcr.microsoft.com ARG InstallerRepo=mcr.microsoft.com/powershell -ARG NanoServerRepo=windows/nanoserver +ARG NanoServerRepo=windows/server ARG tag=ltsc2022 # Use server core as an installer container to extract PowerShell, diff --git a/release/lts/nanoserver2022/meta.json b/release/lts/nanoserver2022/meta.json index b89decb8a..9bdafd6be 100644 --- a/release/lts/nanoserver2022/meta.json +++ b/release/lts/nanoserver2022/meta.json @@ -19,6 +19,5 @@ "TestProperties": { "size": 1 }, - "UseAcr": true, - "IsPrivate": true + "UseAcr": true } diff --git a/release/lts/windowsservercore2022/meta.json b/release/lts/windowsservercore2022/meta.json index 2bb12640a..7fc9aec13 100644 --- a/release/lts/windowsservercore2022/meta.json +++ b/release/lts/windowsservercore2022/meta.json @@ -19,6 +19,5 @@ "TestProperties": { "size": 1 }, - "UseAcr": true, - "IsPrivate": true + "UseAcr": true } From 23fb0252d009bbd5dfd23f1b704642a70cdeec22 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Fri, 13 Aug 2021 11:35:18 -0400 Subject: [PATCH 04/16] change from location for nanoserver and make preview images public for windows LTSC2022 release --- release/preview/nanoserver2022/docker/Dockerfile | 2 +- release/preview/nanoserver2022/meta.json | 3 +-- release/preview/windowsservercore2022/meta.json | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/preview/nanoserver2022/docker/Dockerfile index 0ad72445d..2215cef69 100644 --- a/release/preview/nanoserver2022/docker/Dockerfile +++ b/release/preview/nanoserver2022/docker/Dockerfile @@ -6,7 +6,7 @@ ARG InstallerVersion=nanoserver ARG dockerHost=mcr.microsoft.com ARG InstallerRepo=mcr.microsoft.com/powershell -ARG NanoServerRepo=windows/nanoserver +ARG NanoServerRepo=windows/server ARG tag=ltsc2022 # Use server core as an installer container to extract PowerShell, diff --git a/release/preview/nanoserver2022/meta.json b/release/preview/nanoserver2022/meta.json index e4553ab95..163b77f26 100644 --- a/release/preview/nanoserver2022/meta.json +++ b/release/preview/nanoserver2022/meta.json @@ -16,6 +16,5 @@ "TestProperties": { "size": 1 }, - "UseAcr": true, - "IsPrivate": true + "UseAcr": true } diff --git a/release/preview/windowsservercore2022/meta.json b/release/preview/windowsservercore2022/meta.json index fb0577433..fb4fd04eb 100644 --- a/release/preview/windowsservercore2022/meta.json +++ b/release/preview/windowsservercore2022/meta.json @@ -16,6 +16,5 @@ "TestProperties": { "size": 1 }, - "UseAcr": true, - "IsPrivate": true + "UseAcr": true } From fdea4af1afc6b49b0296c67d1f7cb2a3edcfc860 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Fri, 13 Aug 2021 15:32:05 -0400 Subject: [PATCH 05/16] hardcode dockerhost path and don't modify NanoServerRepo variable --- release/lts/nanoserver2022/docker/Dockerfile | 6 +++--- release/preview/nanoserver2022/docker/Dockerfile | 6 +++--- release/stable/nanoserver2022/docker/Dockerfile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile index 2215cef69..5ca4f8a3c 100644 --- a/release/lts/nanoserver2022/docker/Dockerfile +++ b/release/lts/nanoserver2022/docker/Dockerfile @@ -4,9 +4,9 @@ # Args used by from statements must be defined here: ARG InstallerVersion=nanoserver -ARG dockerHost=mcr.microsoft.com +ARG dockerHost=mcr.microsoft.com/windows/server ARG InstallerRepo=mcr.microsoft.com/powershell -ARG NanoServerRepo=windows/server +ARG NanoServerRepo=windows/nanoserver ARG tag=ltsc2022 # Use server core as an installer container to extract PowerShell, @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM ${dockerHost}/${NanoServerRepo}:${tag} +FROM ${dockerHost}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/preview/nanoserver2022/docker/Dockerfile index 2215cef69..5ca4f8a3c 100644 --- a/release/preview/nanoserver2022/docker/Dockerfile +++ b/release/preview/nanoserver2022/docker/Dockerfile @@ -4,9 +4,9 @@ # Args used by from statements must be defined here: ARG InstallerVersion=nanoserver -ARG dockerHost=mcr.microsoft.com +ARG dockerHost=mcr.microsoft.com/windows/server ARG InstallerRepo=mcr.microsoft.com/powershell -ARG NanoServerRepo=windows/server +ARG NanoServerRepo=windows/nanoserver ARG tag=ltsc2022 # Use server core as an installer container to extract PowerShell, @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM ${dockerHost}/${NanoServerRepo}:${tag} +FROM ${dockerHost}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile index 2215cef69..5ca4f8a3c 100644 --- a/release/stable/nanoserver2022/docker/Dockerfile +++ b/release/stable/nanoserver2022/docker/Dockerfile @@ -4,9 +4,9 @@ # Args used by from statements must be defined here: ARG InstallerVersion=nanoserver -ARG dockerHost=mcr.microsoft.com +ARG dockerHost=mcr.microsoft.com/windows/server ARG InstallerRepo=mcr.microsoft.com/powershell -ARG NanoServerRepo=windows/server +ARG NanoServerRepo=windows/nanoserver ARG tag=ltsc2022 # Use server core as an installer container to extract PowerShell, @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM ${dockerHost}/${NanoServerRepo}:${tag} +FROM ${dockerHost}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From c2fd990c3e612b3a5e71fcd7fb972bcc7882a6db Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Fri, 13 Aug 2021 15:45:42 -0400 Subject: [PATCH 06/16] hardcode path to base image --- release/lts/nanoserver2022/docker/Dockerfile | 4 ++-- release/preview/nanoserver2022/docker/Dockerfile | 4 ++-- release/stable/nanoserver2022/docker/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile index 5ca4f8a3c..fe3a053e7 100644 --- a/release/lts/nanoserver2022/docker/Dockerfile +++ b/release/lts/nanoserver2022/docker/Dockerfile @@ -4,7 +4,7 @@ # Args used by from statements must be defined here: ARG InstallerVersion=nanoserver -ARG dockerHost=mcr.microsoft.com/windows/server +ARG dockerHost=mcr.microsoft.com ARG InstallerRepo=mcr.microsoft.com/powershell ARG NanoServerRepo=windows/nanoserver ARG tag=ltsc2022 @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM ${dockerHost}:${tag} +FROM mcr.microsoft.com/windows/server:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/preview/nanoserver2022/docker/Dockerfile index 5ca4f8a3c..fe3a053e7 100644 --- a/release/preview/nanoserver2022/docker/Dockerfile +++ b/release/preview/nanoserver2022/docker/Dockerfile @@ -4,7 +4,7 @@ # Args used by from statements must be defined here: ARG InstallerVersion=nanoserver -ARG dockerHost=mcr.microsoft.com/windows/server +ARG dockerHost=mcr.microsoft.com ARG InstallerRepo=mcr.microsoft.com/powershell ARG NanoServerRepo=windows/nanoserver ARG tag=ltsc2022 @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM ${dockerHost}:${tag} +FROM mcr.microsoft.com/windows/server:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile index 5ca4f8a3c..fe3a053e7 100644 --- a/release/stable/nanoserver2022/docker/Dockerfile +++ b/release/stable/nanoserver2022/docker/Dockerfile @@ -4,7 +4,7 @@ # Args used by from statements must be defined here: ARG InstallerVersion=nanoserver -ARG dockerHost=mcr.microsoft.com/windows/server +ARG dockerHost=mcr.microsoft.com ARG InstallerRepo=mcr.microsoft.com/powershell ARG NanoServerRepo=windows/nanoserver ARG tag=ltsc2022 @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM ${dockerHost}:${tag} +FROM mcr.microsoft.com/windows/server:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From 4a623d659a92b6be35899d8735b9a529b74e746b Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 15:24:06 -0700 Subject: [PATCH 07/16] Update release/stable/nanoserver2022/docker/Dockerfile --- release/stable/nanoserver2022/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile index fe3a053e7..338c8a34f 100644 --- a/release/stable/nanoserver2022/docker/Dockerfile +++ b/release/stable/nanoserver2022/docker/Dockerfile @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM mcr.microsoft.com/windows/server:${tag} +FROM mcr.microsoft.com/windows/servercore:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From d59b3f5214f5e2ace03679e8f029d117b751d279 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 15:24:32 -0700 Subject: [PATCH 08/16] Update release/preview/nanoserver2022/docker/Dockerfile --- release/preview/nanoserver2022/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/preview/nanoserver2022/docker/Dockerfile index fe3a053e7..fdf3dc000 100644 --- a/release/preview/nanoserver2022/docker/Dockerfile +++ b/release/preview/nanoserver2022/docker/Dockerfile @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM mcr.microsoft.com/windows/server:${tag} +FROM mcr.microsoft.com/windows/nanoserver:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From 7ee4e9a1c6500def1e03faf0cb0ab07a0733f1a7 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 15:27:10 -0700 Subject: [PATCH 09/16] Apply suggestions from code review --- release/lts/nanoserver2022/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile index fe3a053e7..fdf3dc000 100644 --- a/release/lts/nanoserver2022/docker/Dockerfile +++ b/release/lts/nanoserver2022/docker/Dockerfile @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM mcr.microsoft.com/windows/server:${tag} +FROM mcr.microsoft.com/windows/nanoserver:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From d0455579c30572f24756fa2efaecb1b40c5efef4 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 16:23:24 -0700 Subject: [PATCH 10/16] Update release/stable/nanoserver2022/docker/Dockerfile --- release/stable/nanoserver2022/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile index 338c8a34f..fdf3dc000 100644 --- a/release/stable/nanoserver2022/docker/Dockerfile +++ b/release/stable/nanoserver2022/docker/Dockerfile @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM mcr.microsoft.com/windows/servercore:${tag} +FROM mcr.microsoft.com/windows/nanoserver:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From 1e471533a2c9b7acbb8fa1513dd00d1026ad0547 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 16:24:44 -0700 Subject: [PATCH 11/16] Update Dockerfile --- release/lts/windowsservercore2022/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/lts/windowsservercore2022/docker/Dockerfile b/release/lts/windowsservercore2022/docker/Dockerfile index 084354505..1a165d3e0 100644 --- a/release/lts/windowsservercore2022/docker/Dockerfile +++ b/release/lts/windowsservercore2022/docker/Dockerfile @@ -8,7 +8,7 @@ ARG tag=ltsc2022 # Use server core as an installer container to extract PowerShell, # As this is a multi-stage build, this stage will eventually be thrown away -FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env +FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env ARG PS_VERSION=6.2.0 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip @@ -35,7 +35,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive powershell.zip -DestinationPath \PowerShell # Install PowerShell into WindowsServerCore -FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} +FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From 71bd4827586e55958475538f8bdcaaad58f86e2e Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 16:25:20 -0700 Subject: [PATCH 12/16] Update Dockerfile --- release/preview/windowsservercore2022/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/preview/windowsservercore2022/docker/Dockerfile b/release/preview/windowsservercore2022/docker/Dockerfile index 084354505..1a165d3e0 100644 --- a/release/preview/windowsservercore2022/docker/Dockerfile +++ b/release/preview/windowsservercore2022/docker/Dockerfile @@ -8,7 +8,7 @@ ARG tag=ltsc2022 # Use server core as an installer container to extract PowerShell, # As this is a multi-stage build, this stage will eventually be thrown away -FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env +FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env ARG PS_VERSION=6.2.0 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip @@ -35,7 +35,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive powershell.zip -DestinationPath \PowerShell # Install PowerShell into WindowsServerCore -FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} +FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From 91730f2aac2f5ea3a95765c939637e33787dd050 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 16:26:00 -0700 Subject: [PATCH 13/16] Update Dockerfile --- release/stable/windowsservercore2022/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/stable/windowsservercore2022/docker/Dockerfile b/release/stable/windowsservercore2022/docker/Dockerfile index 084354505..1a165d3e0 100644 --- a/release/stable/windowsservercore2022/docker/Dockerfile +++ b/release/stable/windowsservercore2022/docker/Dockerfile @@ -8,7 +8,7 @@ ARG tag=ltsc2022 # Use server core as an installer container to extract PowerShell, # As this is a multi-stage build, this stage will eventually be thrown away -FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env +FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env ARG PS_VERSION=6.2.0 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/PowerShell-${PS_VERSION}-win-x64.zip @@ -35,7 +35,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive powershell.zip -DestinationPath \PowerShell # Install PowerShell into WindowsServerCore -FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} +FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From 509f5c0840eeee6c3c1178a59adebca458cf2e07 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 16:27:06 -0700 Subject: [PATCH 14/16] Update release/preview/nanoserver2022/docker/Dockerfile --- release/preview/nanoserver2022/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/preview/nanoserver2022/docker/Dockerfile index fdf3dc000..c91928b83 100644 --- a/release/preview/nanoserver2022/docker/Dockerfile +++ b/release/preview/nanoserver2022/docker/Dockerfile @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM mcr.microsoft.com/windows/nanoserver:${tag} +FROM mcr.microsoft.com/${NanoServerRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From 2bbd4473fd569fe9e41013a113899ae471e5b964 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 16:27:37 -0700 Subject: [PATCH 15/16] Update release/lts/nanoserver2022/docker/Dockerfile --- release/lts/nanoserver2022/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile index fdf3dc000..c91928b83 100644 --- a/release/lts/nanoserver2022/docker/Dockerfile +++ b/release/lts/nanoserver2022/docker/Dockerfile @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM mcr.microsoft.com/windows/nanoserver:${tag} +FROM mcr.microsoft.com/${NanoServerRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` From 38018b72e9765e9e9ca80b648ef393d43767b4e3 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 18 Aug 2021 16:28:27 -0700 Subject: [PATCH 16/16] Update release/stable/nanoserver2022/docker/Dockerfile --- release/stable/nanoserver2022/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile index fdf3dc000..c91928b83 100644 --- a/release/stable/nanoserver2022/docker/Dockerfile +++ b/release/stable/nanoserver2022/docker/Dockerfile @@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; ` Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell # Install PowerShell into NanoServer -FROM mcr.microsoft.com/windows/nanoserver:${tag} +FROM mcr.microsoft.com/${NanoServerRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" `