Remove Windows ARM32 for 5.0 (#1799)
This commit is contained in:
Matt Thalman
Родитель
efa4c5809f
Коммит
8175d28bb3
|
|
@ -6,7 +6,6 @@ Windows version: <version>
|
|||
|
||||
1. - [ ] Ensure a ["New Windows Release" issue](https://github.com/dotnet/docker-tools/blob/.github/ISSUE_TEMPLATE/releases/new-windows-release.md) exists for docker-tools repo
|
||||
1. - [ ] Copy the Dockerfiles of the most recent published Windows version for all supported .NET Core versions and place them in a version-specific folder under their respective variants (runtime, aspnet, sdk)
|
||||
- [ ] Include ARM Dockerfiles if the Windows version has ARM support
|
||||
1. - [ ] Modify the Dockerfiles as appropriate for any specific changes related to the new Windows version
|
||||
1. - [ ] Update [manifest.json](https://github.com/dotnet/dotnet-docker/blob/nightly/manifest.json) to reference the new set of Dockerfiles with the appropriate tags
|
||||
1. - [ ] Update the [test data](https://github.com/dotnet/dotnet-docker/blob/nightly/tests/Microsoft.DotNet.Docker.Tests/TestData.cs) to include the new Windows version
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
# escape=`
|
||||
|
||||
ARG REPO=mcr.microsoft.com/dotnet/core/runtime
|
||||
FROM $REPO:5.0-nanoserver-1809-arm32v7
|
||||
|
||||
# Install ASP.NET Core Runtime
|
||||
RUN set "aspnetcore_version=5.0.0-preview.1.20124.5" `
|
||||
&& call curl -SL --output dotnet.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/%aspnetcore_version%/aspnetcore-runtime-%aspnetcore_version%-win-arm.zip `
|
||||
&& tar -zxf dotnet.zip -C "%ProgramFiles%\dotnet" ./shared/Microsoft.AspNetCore.App `
|
||||
&& del dotnet.zip
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# escape=`
|
||||
|
||||
FROM mcr.microsoft.com/windows/nanoserver:1809-arm32v7
|
||||
|
||||
ENV `
|
||||
# Configure web servers to bind to port 80 when present
|
||||
ASPNETCORE_URLS=http://+:80 `
|
||||
# Enable detection of running in a container
|
||||
DOTNET_RUNNING_IN_CONTAINER=true
|
||||
|
||||
# In order to set system PATH, ContainerAdministrator must be used
|
||||
USER ContainerAdministrator
|
||||
RUN setx /M PATH "%PATH%;%ProgramFiles%\dotnet"
|
||||
USER ContainerUser
|
||||
|
||||
# Install .NET Core
|
||||
RUN set "dotnet_version=5.0.0-preview.1.20120.5" `
|
||||
&& call curl -SL --output dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/%dotnet_version%/dotnet-runtime-%dotnet_version%-win-arm.zip `
|
||||
&& mkdir "%ProgramFiles%\dotnet" `
|
||||
&& tar -zxf dotnet.zip -C "%ProgramFiles%\dotnet" `
|
||||
&& del dotnet.zip
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
# escape=`
|
||||
|
||||
FROM mcr.microsoft.com/windows/nanoserver:1809-arm32v7
|
||||
|
||||
ENV `
|
||||
# Enable detection of running in a container
|
||||
DOTNET_RUNNING_IN_CONTAINER=true `
|
||||
# Enable correct mode for dotnet watch (only mode supported in a container)
|
||||
DOTNET_USE_POLLING_FILE_WATCHER=true `
|
||||
# Skip extraction of XML docs - generally not useful within an image/container - helps performance
|
||||
NUGET_XMLDOC_MODE=skip `
|
||||
# PowerShell telemetry for docker image usage
|
||||
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-NanoServer-1809-arm32
|
||||
|
||||
# Install .NET Core SDK
|
||||
RUN set "dotnet_sdk_version=5.0.100-preview.1.20155.7" `
|
||||
&& call curl -SL --output dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/%dotnet_sdk_version%/dotnet-sdk-%dotnet_sdk_version%-win-arm.zip `
|
||||
&& mkdir "%ProgramFiles%\dotnet" `
|
||||
&& tar -zxf dotnet.zip -C "%ProgramFiles%\dotnet" `
|
||||
&& del dotnet.zip
|
||||
|
||||
# Install PowerShell global tool
|
||||
RUN set "powershell_version=7.0.0" `
|
||||
&& call curl -SL --output PowerShell.Windows.arm32.%powershell_version%.nupkg https://pwshtool.blob.core.windows.net/tool/%powershell_version%/PowerShell.Windows.arm32.%powershell_version%.nupkg `
|
||||
&& mkdir "%ProgramFiles%\powershell" `
|
||||
&& call "%ProgramFiles%\dotnet\dotnet" tool install --add-source . --tool-path "%ProgramFiles%\powershell" --version %powershell_version% PowerShell.Windows.arm32 `
|
||||
&& call rmdir "%TEMP%\NuGetScratch" /S /Q `
|
||||
&& call del PowerShell.Windows.arm32.%powershell_version%.nupkg `
|
||||
&& call del "%ProgramFiles%\powershell\.store\powershell.windows.arm32\%powershell_version%\powershell.windows.arm32\%powershell_version%\powershell.windows.arm32.%powershell_version%.nupkg"
|
||||
|
||||
# In order to set system PATH, ContainerAdministrator must be used
|
||||
USER ContainerAdministrator
|
||||
RUN setx /M PATH "%PATH%;%ProgramFiles%\dotnet;%ProgramFiles%\powershell"
|
||||
USER ContainerUser
|
||||
|
|
@ -137,11 +137,6 @@ Tag | Dockerfile
|
|||
---------| ---------------
|
||||
3.1.3-nanoserver-1809-arm32v7, 3.1-nanoserver-1809-arm32v7, 3.1.3, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1809/arm32v7/Dockerfile)
|
||||
|
||||
##### .NET Core 5.0 Preview Tags
|
||||
Tag | Dockerfile
|
||||
---------| ---------------
|
||||
5.0.0-preview-nanoserver-1809-arm32v7, 5.0-nanoserver-1809-arm32v7, 5.0.0-preview, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1809/arm32v7/Dockerfile)
|
||||
|
||||
You can retrieve a list of all available tags for dotnet/core/aspnet at https://mcr.microsoft.com/v2/dotnet/core/aspnet/tags/list.
|
||||
|
||||
# Support
|
||||
|
|
|
|||
|
|
@ -133,11 +133,6 @@ Tag | Dockerfile
|
|||
---------| ---------------
|
||||
3.1.3-nanoserver-1809-arm32v7, 3.1-nanoserver-1809-arm32v7, 3.1.3, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1809/arm32v7/Dockerfile)
|
||||
|
||||
##### .NET Core 5.0 Preview Tags
|
||||
Tag | Dockerfile
|
||||
---------| ---------------
|
||||
5.0.0-preview-nanoserver-1809-arm32v7, 5.0-nanoserver-1809-arm32v7, 5.0.0-preview, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1809/arm32v7/Dockerfile)
|
||||
|
||||
You can retrieve a list of all available tags for dotnet/core/runtime at https://mcr.microsoft.com/v2/dotnet/core/runtime/tags/list.
|
||||
|
||||
# Support
|
||||
|
|
|
|||
|
|
@ -134,11 +134,6 @@ Tag | Dockerfile
|
|||
---------| ---------------
|
||||
3.1.201-nanoserver-1809-arm32v7, 3.1-nanoserver-1809-arm32v7, 3.1.201, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1809/arm32v7/Dockerfile)
|
||||
|
||||
##### .NET Core 5.0 Preview Tags
|
||||
Tag | Dockerfile
|
||||
---------| ---------------
|
||||
5.0.100-preview-nanoserver-1809-arm32v7, 5.0-nanoserver-1809-arm32v7, 5.0.100-preview, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1809/arm32v7/Dockerfile)
|
||||
|
||||
You can retrieve a list of all available tags for dotnet/core/sdk at https://mcr.microsoft.com/v2/dotnet/core/sdk/tags/list.
|
||||
|
||||
# Support
|
||||
|
|
|
|||
|
|
@ -42,5 +42,3 @@ $(McrTagsYmlTagGroup:2.1-nanoserver-1809)
|
|||
$(McrTagsYmlTagGroup:5.0-nanoserver-1809)
|
||||
customSubTableTitle: .NET Core 5.0 Preview Tags
|
||||
$(McrTagsYmlTagGroup:3.1-nanoserver-1809-arm32v7)
|
||||
$(McrTagsYmlTagGroup:5.0-nanoserver-1809-arm32v7)
|
||||
customSubTableTitle: .NET Core 5.0 Preview Tags
|
||||
|
|
|
|||
|
|
@ -42,5 +42,3 @@ $(McrTagsYmlTagGroup:2.1-nanoserver-1809)
|
|||
$(McrTagsYmlTagGroup:5.0-nanoserver-1809)
|
||||
customSubTableTitle: .NET Core 5.0 Preview Tags
|
||||
$(McrTagsYmlTagGroup:3.1-nanoserver-1809-arm32v7)
|
||||
$(McrTagsYmlTagGroup:5.0-nanoserver-1809-arm32v7)
|
||||
customSubTableTitle: .NET Core 5.0 Preview Tags
|
||||
|
|
|
|||
|
|
@ -38,5 +38,3 @@ $(McrTagsYmlTagGroup:2.1-nanoserver-1809)
|
|||
$(McrTagsYmlTagGroup:5.0-nanoserver-1809)
|
||||
customSubTableTitle: .NET Core 5.0 Preview Tags
|
||||
$(McrTagsYmlTagGroup:3.1-nanoserver-1809-arm32v7)
|
||||
$(McrTagsYmlTagGroup:5.0-nanoserver-1809-arm32v7)
|
||||
customSubTableTitle: .NET Core 5.0 Preview Tags
|
||||
|
|
|
|||
|
|
@ -846,16 +846,6 @@
|
|||
"5.0-nanoserver-1809": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"architecture": "arm",
|
||||
"dockerfile": "5.0/runtime/nanoserver-1809/arm32v7",
|
||||
"os": "windows",
|
||||
"osVersion": "nanoserver-1809",
|
||||
"tags": {
|
||||
"$(5.0-RuntimeVersion)-nanoserver-1809-arm32v7": {},
|
||||
"5.0-nanoserver-1809-arm32v7": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"dockerfile": "5.0/runtime/nanoserver-1903/amd64",
|
||||
"os": "windows",
|
||||
|
|
@ -1389,19 +1379,6 @@
|
|||
"5.0-nanoserver-1809": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"architecture": "arm",
|
||||
"buildArgs": {
|
||||
"REPO": "$(Repo:runtime)"
|
||||
},
|
||||
"dockerfile": "5.0/aspnet/nanoserver-1809/arm32v7",
|
||||
"os": "windows",
|
||||
"osVersion": "nanoserver-1809",
|
||||
"tags": {
|
||||
"$(5.0-RuntimeVersion)-nanoserver-1809-arm32v7": {},
|
||||
"5.0-nanoserver-1809-arm32v7": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"buildArgs": {
|
||||
"REPO": "$(Repo:runtime)"
|
||||
|
|
@ -1833,16 +1810,6 @@
|
|||
"5.0-nanoserver-1809": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"architecture": "arm",
|
||||
"dockerfile": "5.0/sdk/nanoserver-1809/arm32v7",
|
||||
"os": "windows",
|
||||
"osVersion": "nanoserver-1809",
|
||||
"tags": {
|
||||
"$(5.0-SdkVersion)-nanoserver-1809-arm32v7": {},
|
||||
"5.0-nanoserver-1809-arm32v7": {}
|
||||
}
|
||||
},
|
||||
{
|
||||
"dockerfile": "5.0/sdk/nanoserver-1903/amd64",
|
||||
"os": "windows",
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ namespace Microsoft.DotNet.Docker.Tests
|
|||
new ProductImageData { Version = V3_1, OS = OS.NanoServer1903, Arch = Arch.Amd64 },
|
||||
new ProductImageData { Version = V3_1, OS = OS.NanoServer1909, Arch = Arch.Amd64 },
|
||||
new ProductImageData { Version = V5_0, OS = OS.NanoServer1809, Arch = Arch.Amd64 },
|
||||
new ProductImageData { Version = V5_0, OS = OS.NanoServer1809, Arch = Arch.Arm },
|
||||
new ProductImageData { Version = V5_0, OS = OS.NanoServer1903, Arch = Arch.Amd64 },
|
||||
new ProductImageData { Version = V5_0, OS = OS.NanoServer1909, Arch = Arch.Amd64 },
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
"3.1/runtime/nanoserver-1903/amd64": 326438075,
|
||||
"3.1/runtime/nanoserver-1909/amd64": 328083762,
|
||||
"5.0/runtime/nanoserver-1809/amd64": 321408734,
|
||||
"5.0/runtime/nanoserver-1809/arm32v7": 256353134,
|
||||
"5.0/runtime/nanoserver-1903/amd64": 326438075,
|
||||
"5.0/runtime/nanoserver-1909/amd64": 328083762
|
||||
},
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
"3.1/aspnet/nanoserver-1903/amd64": 346102290,
|
||||
"3.1/aspnet/nanoserver-1909/amd64": 347747977,
|
||||
"5.0/aspnet/nanoserver-1809/amd64": 341072949,
|
||||
"5.0/aspnet/nanoserver-1809/arm32v7": 278558953,
|
||||
"5.0/aspnet/nanoserver-1903/amd64": 346102290,
|
||||
"5.0/aspnet/nanoserver-1909/amd64": 347747977
|
||||
},
|
||||
|
|
@ -34,7 +32,6 @@
|
|||
"3.1/sdk/nanoserver-1903/amd64": 735894844,
|
||||
"3.1/sdk/nanoserver-1909/amd64": 737661435,
|
||||
"5.0/sdk/nanoserver-1809/amd64": 730951559,
|
||||
"5.0/sdk/nanoserver-1809/arm32v7": 559712172,
|
||||
"5.0/sdk/nanoserver-1903/amd64": 735894844,
|
||||
"5.0/sdk/nanoserver-1909/amd64": 737661435
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче