Skip to content

Public 2022 images #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Aug 19, 2021
Merged

Public 2022 images #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
44da4fd
update stable nanoserver2022 image to pull from new windows LTSC2022 …
anamnavi Aug 13, 2021
fa1422d
for windows 2022 release, prepare windowsservercore image to be public
anamnavi Aug 13, 2021
00e0860
change from location for nanoserver and make images public for window…
anamnavi Aug 13, 2021
23fb025
change from location for nanoserver and make preview images public fo…
anamnavi Aug 13, 2021
fdea4af
hardcode dockerhost path and don't modify NanoServerRepo variable
anamnavi Aug 13, 2021
c2fd990
hardcode path to base image
anamnavi Aug 13, 2021
4a623d6
Update release/stable/nanoserver2022/docker/Dockerfile
TravisEz13 Aug 18, 2021
d59b3f5
Update release/preview/nanoserver2022/docker/Dockerfile
TravisEz13 Aug 18, 2021
7ee4e9a
Apply suggestions from code review
TravisEz13 Aug 18, 2021
d045557
Update release/stable/nanoserver2022/docker/Dockerfile
TravisEz13 Aug 18, 2021
1e47153
Update Dockerfile
TravisEz13 Aug 18, 2021
71bd482
Update Dockerfile
TravisEz13 Aug 18, 2021
91730f2
Update Dockerfile
TravisEz13 Aug 18, 2021
509f5c0
Update release/preview/nanoserver2022/docker/Dockerfile
TravisEz13 Aug 18, 2021
2bbd447
Update release/lts/nanoserver2022/docker/Dockerfile
TravisEz13 Aug 18, 2021
38018b7
Update release/stable/nanoserver2022/docker/Dockerfile
TravisEz13 Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion release/lts/nanoserver2022/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" `
Expand Down
3 changes: 1 addition & 2 deletions release/lts/nanoserver2022/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
"TestProperties": {
"size": 1
},
"UseAcr": true,
"IsPrivate": true
"UseAcr": true
}
4 changes: 2 additions & 2 deletions release/lts/windowsservercore2022/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" `
Expand Down
3 changes: 1 addition & 2 deletions release/lts/windowsservercore2022/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
"TestProperties": {
"size": 1
},
"UseAcr": true,
"IsPrivate": true
"UseAcr": true
}
2 changes: 1 addition & 1 deletion release/preview/nanoserver2022/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" `
Expand Down
3 changes: 1 addition & 2 deletions release/preview/nanoserver2022/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
"TestProperties": {
"size": 1
},
"UseAcr": true,
"IsPrivate": true
"UseAcr": true
}
4 changes: 2 additions & 2 deletions release/preview/windowsservercore2022/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" `
Expand Down
3 changes: 1 addition & 2 deletions release/preview/windowsservercore2022/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
"TestProperties": {
"size": 1
},
"UseAcr": true,
"IsPrivate": true
"UseAcr": true
}
2 changes: 1 addition & 1 deletion release/stable/nanoserver2022/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" `
Expand Down
3 changes: 1 addition & 2 deletions release/stable/nanoserver2022/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
"TestProperties": {
"size": 1
},
"UseAcr": true,
"IsPrivate": true
"UseAcr": true
}
4 changes: 2 additions & 2 deletions release/stable/windowsservercore2022/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" `
Expand Down
3 changes: 1 addition & 2 deletions release/stable/windowsservercore2022/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
"TestProperties": {
"size": 1
},
"UseAcr": true,
"IsPrivate": true
"UseAcr": true
}