diff --git a/release/lts/nanoserver2022/docker/Dockerfile b/release/lts/nanoserver2022/docker/Dockerfile index 0ad72445d..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 ${dockerHost}/${NanoServerRepo}:${tag} +FROM mcr.microsoft.com/${NanoServerRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` 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/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" ` 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 } diff --git a/release/preview/nanoserver2022/docker/Dockerfile b/release/preview/nanoserver2022/docker/Dockerfile index 0ad72445d..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 ${dockerHost}/${NanoServerRepo}:${tag} +FROM mcr.microsoft.com/${NanoServerRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` 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/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" ` 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 } diff --git a/release/stable/nanoserver2022/docker/Dockerfile b/release/stable/nanoserver2022/docker/Dockerfile index 0ad72445d..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 ${dockerHost}/${NanoServerRepo}:${tag} +FROM mcr.microsoft.com/${NanoServerRepo}:${tag} # Copy PowerShell Core from the installer container ENV ProgramFiles="C:\Program Files" ` 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 } 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" ` 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 }