Skip to content

Commit b8e960b

Browse files
anamnaviTravisEz13
andauthored
Public 2022 images (#569)
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
1 parent b37afbd commit b8e960b

File tree

12 files changed

+15
-21
lines changed

12 files changed

+15
-21
lines changed

release/lts/nanoserver2022/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; `
4444
Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
4545

4646
# Install PowerShell into NanoServer
47-
FROM ${dockerHost}/${NanoServerRepo}:${tag}
47+
FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
4848

4949
# Copy PowerShell Core from the installer container
5050
ENV ProgramFiles="C:\Program Files" `

release/lts/nanoserver2022/meta.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@
1919
"TestProperties": {
2020
"size": 1
2121
},
22-
"UseAcr": true,
23-
"IsPrivate": true
22+
"UseAcr": true
2423
}

release/lts/windowsservercore2022/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG tag=ltsc2022
88

99
# Use server core as an installer container to extract PowerShell,
1010
# As this is a multi-stage build, this stage will eventually be thrown away
11-
FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
11+
FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
1212

1313
ARG PS_VERSION=6.2.0
1414
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..."; `
3535
Expand-Archive powershell.zip -DestinationPath \PowerShell
3636

3737
# Install PowerShell into WindowsServerCore
38-
FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
38+
FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
3939

4040
# Copy PowerShell Core from the installer container
4141
ENV ProgramFiles="C:\Program Files" `

release/lts/windowsservercore2022/meta.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@
1919
"TestProperties": {
2020
"size": 1
2121
},
22-
"UseAcr": true,
23-
"IsPrivate": true
22+
"UseAcr": true
2423
}

release/preview/nanoserver2022/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; `
4444
Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
4545

4646
# Install PowerShell into NanoServer
47-
FROM ${dockerHost}/${NanoServerRepo}:${tag}
47+
FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
4848

4949
# Copy PowerShell Core from the installer container
5050
ENV ProgramFiles="C:\Program Files" `

release/preview/nanoserver2022/meta.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
"TestProperties": {
1717
"size": 1
1818
},
19-
"UseAcr": true,
20-
"IsPrivate": true
19+
"UseAcr": true
2120
}

release/preview/windowsservercore2022/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG tag=ltsc2022
88

99
# Use server core as an installer container to extract PowerShell,
1010
# As this is a multi-stage build, this stage will eventually be thrown away
11-
FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
11+
FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
1212

1313
ARG PS_VERSION=6.2.0
1414
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..."; `
3535
Expand-Archive powershell.zip -DestinationPath \PowerShell
3636

3737
# Install PowerShell into WindowsServerCore
38-
FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
38+
FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
3939

4040
# Copy PowerShell Core from the installer container
4141
ENV ProgramFiles="C:\Program Files" `

release/preview/windowsservercore2022/meta.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
"TestProperties": {
1717
"size": 1
1818
},
19-
"UseAcr": true,
20-
"IsPrivate": true
19+
"UseAcr": true
2120
}

release/stable/nanoserver2022/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN Write-host "Verifying valid Version..."; `
4444
Expand-Archive /installer/powershell.zip -DestinationPath \PowerShell
4545

4646
# Install PowerShell into NanoServer
47-
FROM ${dockerHost}/${NanoServerRepo}:${tag}
47+
FROM mcr.microsoft.com/${NanoServerRepo}:${tag}
4848

4949
# Copy PowerShell Core from the installer container
5050
ENV ProgramFiles="C:\Program Files" `

release/stable/nanoserver2022/meta.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@
1919
"TestProperties": {
2020
"size": 1
2121
},
22-
"UseAcr": true,
23-
"IsPrivate": true
22+
"UseAcr": true
2423
}

release/stable/windowsservercore2022/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG tag=ltsc2022
88

99
# Use server core as an installer container to extract PowerShell,
1010
# As this is a multi-stage build, this stage will eventually be thrown away
11-
FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag} AS installer-env
11+
FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag} AS installer-env
1212

1313
ARG PS_VERSION=6.2.0
1414
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..."; `
3535
Expand-Archive powershell.zip -DestinationPath \PowerShell
3636

3737
# Install PowerShell into WindowsServerCore
38-
FROM ${dockerHost}/${WindowsServerCoreRepo}:${tag}
38+
FROM mcr.microsoft.com/${WindowsServerCoreRepo}:${tag}
3939

4040
# Copy PowerShell Core from the installer container
4141
ENV ProgramFiles="C:\Program Files" `

release/stable/windowsservercore2022/meta.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@
1919
"TestProperties": {
2020
"size": 1
2121
},
22-
"UseAcr": true,
23-
"IsPrivate": true
22+
"UseAcr": true
2423
}

0 commit comments

Comments
 (0)