diff --git a/README.aspnet.md b/README.aspnet.md index 26103bf960..4b55a4a60f 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -69,9 +69,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.0-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 -6.0.0-preview.3-alpine3.13-amd64, 6.0-alpine3.13-amd64, 6.0-alpine-amd64, 6.0.0-preview.3-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.13/amd64/Dockerfile) | Alpine 3.13 -6.0.0-preview.3-focal-amd64, 6.0-focal-amd64, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.0-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-amd64, 6.0-alpine3.13-amd64, 6.0-alpine-amd64, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.13/amd64/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-amd64, 6.0-focal-amd64, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 ## Linux arm64 Tags Tags | Dockerfile | OS Version @@ -89,9 +89,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.0-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 -6.0.0-preview.3-alpine3.13-arm64v8, 6.0-alpine3.13-arm64v8, 6.0-alpine-arm64v8, 6.0.0-preview.3-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.13/arm64v8/Dockerfile) | Alpine 3.13 -6.0.0-preview.3-focal-arm64v8, 6.0-focal-arm64v8, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.0-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-arm64v8, 6.0-alpine3.13-arm64v8, 6.0-alpine-arm64v8, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.13/arm64v8/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-arm64v8, 6.0-focal-arm64v8, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04 ## Linux arm32 Tags Tags | Dockerfile | OS Version @@ -108,8 +108,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.0-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 -6.0.0-preview.3-focal-arm32v7, 6.0-focal-arm32v7, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.0-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-arm32v7, 6.0-alpine3.13-arm32v7, 6.0-alpine-arm32v7, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.13/arm32v7/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-arm32v7, 6.0-focal-arm32v7, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 ## Nano Server, version 20H2 amd64 Tags Tag | Dockerfile @@ -121,7 +122,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.0-preview.3-nanoserver-20H2, 6.0-nanoserver-20H2, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/nanoserver-20H2/amd64/Dockerfile) +6.0.0-preview.4-nanoserver-20H2, 6.0-nanoserver-20H2, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/nanoserver-20H2/amd64/Dockerfile) ## Nano Server, version 2004 amd64 Tags Tag | Dockerfile @@ -133,7 +134,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.0-preview.3-nanoserver-2004, 6.0-nanoserver-2004, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/nanoserver-2004/amd64/Dockerfile) +6.0.0-preview.4-nanoserver-2004, 6.0-nanoserver-2004, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/nanoserver-2004/amd64/Dockerfile) ## Nano Server, version 1809 amd64 Tags Tag | Dockerfile @@ -145,7 +146,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.0-preview.3-nanoserver-1809, 6.0-nanoserver-1809, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/nanoserver-1809/amd64/Dockerfile) +6.0.0-preview.4-nanoserver-1809, 6.0-nanoserver-1809, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/nanoserver-1809/amd64/Dockerfile) ## Windows Server Core 2019 amd64 Tags Tag | Dockerfile @@ -155,7 +156,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.0-preview.3-windowsservercore-ltsc2019, 6.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/windowsservercore-ltsc2019/amd64/Dockerfile) +6.0.0-preview.4-windowsservercore-ltsc2019, 6.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/windowsservercore-ltsc2019/amd64/Dockerfile) You can retrieve a list of all available tags for dotnet/aspnet at https://mcr.microsoft.com/v2/dotnet/aspnet/tags/list. diff --git a/README.runtime-deps.md b/README.runtime-deps.md index 9726303168..0227a2571c 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -57,9 +57,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.0-preview.3, 6.0.0-preview.3-bullseye-slim, 6.0, 6.0-bullseye-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 -6.0.0-preview.3-alpine3.13-amd64, 6.0-alpine3.13-amd64, 6.0-alpine-amd64, 6.0.0-preview.3-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/alpine3.13/amd64/Dockerfile) | Alpine 3.13 -6.0.0-preview.3-focal-amd64, 6.0-focal-amd64, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/focal/amd64/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.0-preview.4, 6.0.0-preview.4-bullseye-slim, 6.0, 6.0-bullseye-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-amd64, 6.0-alpine3.13-amd64, 6.0-alpine-amd64, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/alpine3.13/amd64/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-amd64, 6.0-focal-amd64, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/focal/amd64/Dockerfile) | Ubuntu 20.04 ## Linux arm64 Tags Tags | Dockerfile | OS Version @@ -77,9 +77,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.0-preview.3, 6.0.0-preview.3-bullseye-slim, 6.0, 6.0-bullseye-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 -6.0.0-preview.3-alpine3.13-arm64v8, 6.0-alpine3.13-arm64v8, 6.0-alpine-arm64v8, 6.0.0-preview.3-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/alpine3.13/arm64v8/Dockerfile) | Alpine 3.13 -6.0.0-preview.3-focal-arm64v8, 6.0-focal-arm64v8, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/focal/arm64v8/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.0-preview.4, 6.0.0-preview.4-bullseye-slim, 6.0, 6.0-bullseye-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-arm64v8, 6.0-alpine3.13-arm64v8, 6.0-alpine-arm64v8, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/alpine3.13/arm64v8/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-arm64v8, 6.0-focal-arm64v8, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/focal/arm64v8/Dockerfile) | Ubuntu 20.04 ## Linux arm32 Tags Tags | Dockerfile | OS Version @@ -96,8 +96,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.0-preview.3, 6.0.0-preview.3-bullseye-slim, 6.0, 6.0-bullseye-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 -6.0.0-preview.3-focal-arm32v7, 6.0-focal-arm32v7, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.0-preview.4, 6.0.0-preview.4-bullseye-slim, 6.0, 6.0-bullseye-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-arm32v7, 6.0-alpine3.13-arm32v7, 6.0-alpine-arm32v7, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/6.0/alpine3.13/arm32v7/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-arm32v7, 6.0-focal-arm32v7, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/3.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04 You can retrieve a list of all available tags for dotnet/runtime-deps at https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list. diff --git a/README.runtime.md b/README.runtime.md index 430bc9b8ee..3cc280173b 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -65,9 +65,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.0-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 -6.0.0-preview.3-alpine3.13-amd64, 6.0-alpine3.13-amd64, 6.0-alpine-amd64, 6.0.0-preview.3-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.13/amd64/Dockerfile) | Alpine 3.13 -6.0.0-preview.3-focal-amd64, 6.0-focal-amd64, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.0-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-amd64, 6.0-alpine3.13-amd64, 6.0-alpine-amd64, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.13/amd64/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-amd64, 6.0-focal-amd64, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 ## Linux arm64 Tags Tags | Dockerfile | OS Version @@ -85,9 +85,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.0-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 -6.0.0-preview.3-alpine3.13-arm64v8, 6.0-alpine3.13-arm64v8, 6.0-alpine-arm64v8, 6.0.0-preview.3-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.13/arm64v8/Dockerfile) | Alpine 3.13 -6.0.0-preview.3-focal-arm64v8, 6.0-focal-arm64v8, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.0-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-arm64v8, 6.0-alpine3.13-arm64v8, 6.0-alpine-arm64v8, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.13/arm64v8/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-arm64v8, 6.0-focal-arm64v8, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04 ## Linux arm32 Tags Tags | Dockerfile | OS Version @@ -104,8 +104,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.0-preview.3-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.0-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 -6.0.0-preview.3-focal-arm32v7, 6.0-focal-arm32v7, 6.0.0-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 +6.0.0-preview.4-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.0-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 +6.0.0-preview.4-alpine3.13-arm32v7, 6.0-alpine3.13-arm32v7, 6.0-alpine-arm32v7, 6.0.0-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.13/arm32v7/Dockerfile) | Alpine 3.13 +6.0.0-preview.4-focal-arm32v7, 6.0-focal-arm32v7, 6.0.0-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 ## Nano Server, version 20H2 amd64 Tags Tag | Dockerfile @@ -117,7 +118,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.0-preview.3-nanoserver-20H2, 6.0-nanoserver-20H2, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/nanoserver-20H2/amd64/Dockerfile) +6.0.0-preview.4-nanoserver-20H2, 6.0-nanoserver-20H2, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/nanoserver-20H2/amd64/Dockerfile) ## Nano Server, version 2004 amd64 Tags Tag | Dockerfile @@ -129,7 +130,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.0-preview.3-nanoserver-2004, 6.0-nanoserver-2004, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/nanoserver-2004/amd64/Dockerfile) +6.0.0-preview.4-nanoserver-2004, 6.0-nanoserver-2004, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/nanoserver-2004/amd64/Dockerfile) ## Nano Server, version 1809 amd64 Tags Tag | Dockerfile @@ -141,7 +142,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.0-preview.3-nanoserver-1809, 6.0-nanoserver-1809, 6.0.0-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/nanoserver-1809/amd64/Dockerfile) +6.0.0-preview.4-nanoserver-1809, 6.0-nanoserver-1809, 6.0.0-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/nanoserver-1809/amd64/Dockerfile) ## Windows Server Core 2019 amd64 Tags Tag | Dockerfile @@ -151,7 +152,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.0-preview.3-windowsservercore-ltsc2019, 6.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/windowsservercore-ltsc2019/amd64/Dockerfile) +6.0.0-preview.4-windowsservercore-ltsc2019, 6.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/windowsservercore-ltsc2019/amd64/Dockerfile) You can retrieve a list of all available tags for dotnet/runtime at https://mcr.microsoft.com/v2/dotnet/runtime/tags/list. diff --git a/README.sdk.md b/README.sdk.md index cc97bb8b6b..c559b7f29c 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -75,9 +75,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.100-preview.3-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.100-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.100-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 -6.0.100-preview.3-alpine3.13-amd64, 6.0-alpine3.13-amd64, 6.0-alpine-amd64, 6.0.100-preview.3-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.13/amd64/Dockerfile) | Alpine 3.13 -6.0.100-preview.3-focal-amd64, 6.0-focal-amd64, 6.0.100-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 +6.0.100-preview.4-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.100-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.100-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 +6.0.100-preview.4-alpine3.13-amd64, 6.0-alpine3.13-amd64, 6.0-alpine-amd64, 6.0.100-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.13/amd64/Dockerfile) | Alpine 3.13 +6.0.100-preview.4-focal-amd64, 6.0-focal-amd64, 6.0.100-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 ## Linux arm64 Tags Tags | Dockerfile | OS Version @@ -91,9 +91,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.100-preview.3-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.100-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.100-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 -6.0.100-preview.3-alpine3.13-arm64v8, 6.0-alpine3.13-arm64v8, 6.0-alpine-arm64v8, 6.0.100-preview.3-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.13/arm64v8/Dockerfile) | Alpine 3.13 -6.0.100-preview.3-focal-arm64v8, 6.0-focal-arm64v8, 6.0.100-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04 +6.0.100-preview.4-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.100-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.100-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 +6.0.100-preview.4-alpine3.13-arm64v8, 6.0-alpine3.13-arm64v8, 6.0-alpine-arm64v8, 6.0.100-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.13/arm64v8/Dockerfile) | Alpine 3.13 +6.0.100-preview.4-focal-arm64v8, 6.0-focal-arm64v8, 6.0.100-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04 ## Linux arm32 Tags Tags | Dockerfile | OS Version @@ -110,8 +110,9 @@ Tags | Dockerfile | OS Version ##### .NET 6.0 Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.100-preview.3-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.100-preview.3-bullseye-slim, 6.0-bullseye-slim, 6.0.100-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 -6.0.100-preview.3-focal-arm32v7, 6.0-focal-arm32v7, 6.0.100-preview.3-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 +6.0.100-preview.4-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.100-preview.4-bullseye-slim, 6.0-bullseye-slim, 6.0.100-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 +6.0.100-preview.4-alpine3.13-arm32v7, 6.0-alpine3.13-arm32v7, 6.0-alpine-arm32v7, 6.0.100-preview.4-alpine3.13, 6.0-alpine3.13, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.13/arm32v7/Dockerfile) | Alpine 3.13 +6.0.100-preview.4-focal-arm32v7, 6.0-focal-arm32v7, 6.0.100-preview.4-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 ## Nano Server, version 20H2 amd64 Tags Tag | Dockerfile @@ -123,7 +124,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.100-preview.3-nanoserver-20H2, 6.0-nanoserver-20H2, 6.0.100-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-20H2/amd64/Dockerfile) +6.0.100-preview.4-nanoserver-20H2, 6.0-nanoserver-20H2, 6.0.100-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-20H2/amd64/Dockerfile) ## Nano Server, version 2004 amd64 Tags Tag | Dockerfile @@ -135,7 +136,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.100-preview.3-nanoserver-2004, 6.0-nanoserver-2004, 6.0.100-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-2004/amd64/Dockerfile) +6.0.100-preview.4-nanoserver-2004, 6.0-nanoserver-2004, 6.0.100-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-2004/amd64/Dockerfile) ## Nano Server, version 1809 amd64 Tags Tag | Dockerfile @@ -147,7 +148,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.100-preview.3-nanoserver-1809, 6.0-nanoserver-1809, 6.0.100-preview.3, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-1809/amd64/Dockerfile) +6.0.100-preview.4-nanoserver-1809, 6.0-nanoserver-1809, 6.0.100-preview.4, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-1809/amd64/Dockerfile) ## Windows Server Core 2019 amd64 Tags Tag | Dockerfile @@ -157,7 +158,7 @@ Tag | Dockerfile ##### .NET 6.0 Preview Tags Tag | Dockerfile ---------| --------------- -6.0.100-preview.3-windowsservercore-ltsc2019, 6.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/windowsservercore-ltsc2019/amd64/Dockerfile) +6.0.100-preview.4-windowsservercore-ltsc2019, 6.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/windowsservercore-ltsc2019/amd64/Dockerfile) You can retrieve a list of all available tags for dotnet/sdk at https://mcr.microsoft.com/v2/dotnet/sdk/tags/list. diff --git a/eng/dockerfile-templates/aspnet/6.0/Dockerfile.alpine b/eng/dockerfile-templates/aspnet/6.0/Dockerfile.alpine index b20d237424..ffb6a05a47 100644 --- a/eng/dockerfile-templates/aspnet/6.0/Dockerfile.alpine +++ b/eng/dockerfile-templates/aspnet/6.0/Dockerfile.alpine @@ -1,9 +1,13 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM $REPO:6.0-{{OS_VERSION}}{{ARCH_TAG_SUFFIX}} -# Install ASP.NET Core -ENV ASPNET_VERSION={{VARIABLES["aspnet|6.0|build-version"]}} +ENV \ + # ASP.NET Core version + ASPNET_VERSION={{VARIABLES["aspnet|6.0|build-version"]}} \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json +# Install ASP.NET Core RUN wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-musl-{{ARCH_SHORT}}.tar.gz \ && aspnetcore_sha512='{{VARIABLES[cat("aspnet|6.0|linux-musl|", ARCH_SHORT, "|sha")]}}' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ diff --git a/eng/dockerfile-templates/aspnet/6.0/Dockerfile.linux b/eng/dockerfile-templates/aspnet/6.0/Dockerfile.linux index 51a273b70d..0c3f0345a5 100644 --- a/eng/dockerfile-templates/aspnet/6.0/Dockerfile.linux +++ b/eng/dockerfile-templates/aspnet/6.0/Dockerfile.linux @@ -17,6 +17,10 @@ RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/a FROM $REPO:6.0-{{OS_VERSION}}{{ARCH_TAG_SUFFIX}} ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV \ + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/eng/dockerfile-templates/aspnet/6.0/Dockerfile.nanoserver b/eng/dockerfile-templates/aspnet/6.0/Dockerfile.nanoserver index 81e6f962d1..38f47532ea 100644 --- a/eng/dockerfile-templates/aspnet/6.0/Dockerfile.nanoserver +++ b/eng/dockerfile-templates/aspnet/6.0/Dockerfile.nanoserver @@ -26,6 +26,10 @@ RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/do FROM $REPO:6.0-{{OS_VERSION}} ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV ` + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION ` + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/eng/dockerfile-templates/aspnet/6.0/Dockerfile.windowsservercore b/eng/dockerfile-templates/aspnet/6.0/Dockerfile.windowsservercore index 33390c8177..3cd1426f16 100644 --- a/eng/dockerfile-templates/aspnet/6.0/Dockerfile.windowsservercore +++ b/eng/dockerfile-templates/aspnet/6.0/Dockerfile.windowsservercore @@ -3,7 +3,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM $REPO:6.0-{{OS_VERSION}} -ENV ASPNET_VERSION={{VARIABLES["aspnet|6.0|build-version"]}} +ENV ` + # ASP.NET Core version + ASPNET_VERSION={{VARIABLES["aspnet|6.0|build-version"]}} ` + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` diff --git a/eng/dockerfile-templates/sdk/6.0/Dockerfile.alpine b/eng/dockerfile-templates/sdk/6.0/Dockerfile.alpine index 877a41f04d..7d7751eecb 100644 --- a/eng/dockerfile-templates/sdk/6.0/Dockerfile.alpine +++ b/eng/dockerfile-templates/sdk/6.0/Dockerfile.alpine @@ -4,11 +4,18 @@ FROM $REPO:6.0-{{OS_VERSION}}{{ARCH_TAG_SUFFIX}} ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version DOTNET_SDK_VERSION={{VARIABLES["sdk|6.0|build-version"]}} \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage diff --git a/eng/dockerfile-templates/sdk/6.0/Dockerfile.linux b/eng/dockerfile-templates/sdk/6.0/Dockerfile.linux index 7edb5ec75b..8125535c5f 100644 --- a/eng/dockerfile-templates/sdk/6.0/Dockerfile.linux +++ b/eng/dockerfile-templates/sdk/6.0/Dockerfile.linux @@ -4,9 +4,16 @@ FROM $REPO:6.0-{{OS_VERSION}}{{ARCH_TAG_SUFFIX}} ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version DOTNET_SDK_VERSION={{VARIABLES["sdk|6.0|build-version"]}} \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage diff --git a/eng/dockerfile-templates/sdk/6.0/Dockerfile.nanoserver b/eng/dockerfile-templates/sdk/6.0/Dockerfile.nanoserver index c0bbb12bf3..646154930a 100644 --- a/eng/dockerfile-templates/sdk/6.0/Dockerfile.nanoserver +++ b/eng/dockerfile-templates/sdk/6.0/Dockerfile.nanoserver @@ -46,9 +46,16 @@ ARG DOTNET_SDK_VERSION ENV ` # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= ` + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false ` + # Do not show first run text + DOTNET_NOLOGO=true ` + # SDK version DOTNET_SDK_VERSION=$DOTNET_SDK_VERSION ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage diff --git a/eng/dockerfile-templates/sdk/6.0/Dockerfile.windowsservercore b/eng/dockerfile-templates/sdk/6.0/Dockerfile.windowsservercore index 77c041f1eb..917f819807 100644 --- a/eng/dockerfile-templates/sdk/6.0/Dockerfile.windowsservercore +++ b/eng/dockerfile-templates/sdk/6.0/Dockerfile.windowsservercore @@ -6,9 +6,16 @@ FROM $REPO:6.0-{{OS_VERSION}} ENV ` # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= ` + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false ` + # Do not show first run text + DOTNET_NOLOGO=true ` + # SDK version DOTNET_SDK_VERSION={{VARIABLES["sdk|6.0|build-version"]}} ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml index 5fa8394b95..405b176285 100644 --- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml @@ -36,6 +36,8 @@ $(McrTagsYmlTagGroup:3.1-focal-arm64v8) $(McrTagsYmlTagGroup:3.1-bionic-arm64v8) $(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7) customSubTableTitle: .NET 6.0 Preview Tags +$(McrTagsYmlTagGroup:6.0-alpine3.13-arm32v7) + customSubTableTitle: .NET 6.0 Preview Tags $(McrTagsYmlTagGroup:6.0-focal-arm32v7) customSubTableTitle: .NET 6.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml index d120ca13e5..3adabc5c89 100644 --- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml @@ -36,6 +36,8 @@ $(McrTagsYmlTagGroup:3.1-focal-arm64v8) $(McrTagsYmlTagGroup:3.1-bionic-arm64v8) $(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7) customSubTableTitle: .NET 6.0 Preview Tags +$(McrTagsYmlTagGroup:6.0-alpine3.13-arm32v7) + customSubTableTitle: .NET 6.0 Preview Tags $(McrTagsYmlTagGroup:6.0-focal-arm32v7) customSubTableTitle: .NET 6.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml index 84b99c7a45..0698805038 100644 --- a/eng/mcr-tags-metadata-templates/runtime-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml @@ -36,6 +36,8 @@ $(McrTagsYmlTagGroup:3.1-focal-arm64v8) $(McrTagsYmlTagGroup:3.1-bionic-arm64v8) $(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7) customSubTableTitle: .NET 6.0 Preview Tags +$(McrTagsYmlTagGroup:6.0-alpine3.13-arm32v7) + customSubTableTitle: .NET 6.0 Preview Tags $(McrTagsYmlTagGroup:6.0-focal-arm32v7) customSubTableTitle: .NET 6.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml index 7d888489b9..759733ea03 100644 --- a/eng/mcr-tags-metadata-templates/sdk-tags.yml +++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml @@ -32,6 +32,8 @@ $(McrTagsYmlTagGroup:3.1-focal-arm64v8) $(McrTagsYmlTagGroup:3.1-bionic-arm64v8) $(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7) customSubTableTitle: .NET 6.0 Preview Tags +$(McrTagsYmlTagGroup:6.0-alpine3.13-arm32v7) + customSubTableTitle: .NET 6.0 Preview Tags $(McrTagsYmlTagGroup:6.0-focal-arm32v7) customSubTableTitle: .NET 6.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm32v7) diff --git a/manifest.json b/manifest.json index 4f92987528..8b4b073ac3 100644 --- a/manifest.json +++ b/manifest.json @@ -737,6 +737,19 @@ "6.0-alpine-amd64": {} } }, + { + "architecture": "arm", + "dockerfile": "src/runtime-deps/6.0/alpine3.13/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/3.1/Dockerfile.alpine", + "os": "linux", + "osVersion": "alpine3.13", + "tags": { + "$(dotnet|6.0|product-version)-alpine3.13-arm32v7": {}, + "6.0-alpine3.13-arm32v7": {}, + "6.0-alpine-arm32v7": {} + }, + "variant": "v7" + }, { "architecture": "arm64", "dockerfile": "src/runtime-deps/3.1/alpine3.13/arm64v8", @@ -1953,6 +1966,22 @@ "6.0-alpine-amd64": {} } }, + { + "architecture": "arm", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/6.0/alpine3.13/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/6.0/Dockerfile.alpine", + "os": "linux", + "osVersion": "alpine3.13", + "tags": { + "$(dotnet|6.0|product-version)-alpine3.13-arm32v7": {}, + "6.0-alpine3.13-arm32v7": {}, + "6.0-alpine-arm32v7": {} + }, + "variant": "v7" + }, { "architecture": "arm64", "buildArgs": { @@ -3253,6 +3282,22 @@ "6.0-alpine-amd64": {} } }, + { + "architecture": "arm", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/6.0/alpine3.13/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/6.0/Dockerfile.alpine", + "os": "linux", + "osVersion": "alpine3.13", + "tags": { + "$(dotnet|6.0|product-version)-alpine3.13-arm32v7": {}, + "6.0-alpine3.13-arm32v7": {}, + "6.0-alpine-arm32v7": {} + }, + "variant": "v7" + }, { "architecture": "arm64", "buildArgs": { @@ -4534,6 +4579,22 @@ "6.0-alpine-amd64": {} } }, + { + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "architecture": "arm", + "dockerfile": "src/sdk/6.0/alpine3.13/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/6.0/Dockerfile.alpine", + "os": "linux", + "osVersion": "alpine3.13", + "tags": { + "$(sdk|6.0|product-version)-alpine3.13-arm32v7": {}, + "6.0-alpine3.13-arm32v7": {}, + "6.0-alpine-arm32v7": {} + }, + "variant": "v7" + }, { "buildArgs": { "REPO": "$(Repo:aspnet)" diff --git a/manifest.versions.json b/manifest.versions.json index baf8e477b1..aea9001dce 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -22,19 +22,19 @@ "aspnet|5.0|linux|arm64|sha": "40a09a9ff07b078cff17da6d0bfeb427c99c64f15135111831eef94c9d8c6274e9c5f3787c7b7652113e93af2547ed41b26b9d59fb55f28f9aa69cf90e804d0e", "aspnet|5.0|win|x64|sha": "7209135fba2fa706b465e0c1a5f1eee4fff526f282a536b30f2ac2466b697363f1d014524a83ddd90b8eb3d329f766e8476e45fb400aba2af2a77fcc9dbcb7b5", - "aspnet|6.0|build-version": "6.0.0-preview.3.21201.13", - "aspnet|6.0|linux-musl|x64|sha": "80d451713218d1d0ce89d5d0e5205d82811e0a58aac299403cb7fd305f5f70acbe3b21854d2ff85d7666a48a083571c7ea661c7499f8900cac6571732876f831", - "aspnet|6.0|linux-musl|arm|sha": "afd79e40125db4fc6907b4900060f76590762555d89c4baefb9fd87cd4e522db5144e59d777c7c9ecc51c9478b8f61cb921a8f17b48e36940f1e4cf7f1b24e09", - "aspnet|6.0|linux-musl|arm64|sha": "09211c57972a5b2751cf6ba8947d62088974e73fdd1db4e52674dd460dc743ed58180e89434563170b99d735eec0fb88ac4c641076cbfe618c5d83a7708d9925", - "aspnet|6.0|linux|arm|sha": "8514f9455e38c8640f650534742f77b892f0cf6ab4968df702acd9f44afda2a5ae98557d2c4482316c3268ec4bf1f78dcb40e4c729afad77030f45bcad3cffda", - "aspnet|6.0|linux|x64|sha": "05abefd3c1c8f0ffb911e270cf949be144af660e5755af3b1801db4d41beb7234b889ecf1fbb3aeb9f3b51324b4b225c4adc8537fd2f16d61829bd91713f8f1f", - "aspnet|6.0|linux|arm64|sha": "9006cd8a03d03cdbaa2ab9ac76e370fcec9afa77cc6a333eb08468a2fc456fbd36da14b9992102d948f8e698f3370dde6d1568a99912898a19b42d30193bb5f1", - "aspnet|6.0|win|x64|sha": "845dd47a19169916a5bfc509f900cdd5309abf99f608a8a9cd6122e7393aec394c811ea7425de53e614e302304500fd98bedaae52c72551ba7d9c055d4610043", + "aspnet|6.0|build-version": "6.0.0-preview.4.21253.5", + "aspnet|6.0|linux-musl|x64|sha": "861d46655f58d911a63410cda1641852bc578fc4565462a690629ee835074f9f52e0c9922180b4df79aab4283c9ba474db626629d57627ca2a05b75edba9d247", + "aspnet|6.0|linux-musl|arm|sha": "e829ccc67d4c00a790d4d898b1d0541020fbc1f00dce4c311191c4684cfd6788746cd171512348f265c80b768b877ba912cf0709efbad9ee4aa7cf6442576eae", + "aspnet|6.0|linux-musl|arm64|sha": "9ea8cf9b8e2b81dc25b01ad55ea97de9e68d721c2643283b83009601a0f4c4bcc98b18bbf21474638380ee9abede795ce266b5c0b5f1e3dd0c265ae131d7858d", + "aspnet|6.0|linux|arm|sha": "6d4741f71ae38e5864f54c7cbb42dcef85727e631771a7789ecc7307e1c74fd90d9dcc543329de7b51786472c77c60d9d39368faa5e9431708c56ae2ec16a20c", + "aspnet|6.0|linux|x64|sha": "249db1382db95b9e60e4068c253c5381b2b37f30cf815471b623584b690a09ae5f04ef4085e02d2a2950041682188997b1f8e39bad6d5ecc05fb239576ffc1f7", + "aspnet|6.0|linux|arm64|sha": "ab0aa51b272ebcaeb61e1a24e8385b8e4b7ad807576ebdf2ceb76077e517156f6a4f7303cc54198965f98647b99fdb62b6a6f6465e7ed183662561f918664b0a", + "aspnet|6.0|win|x64|sha": "0c5900bf14a911da5e1de3e8d19bb4508439fb08fea743b47ca7523a0586261fc253ff509c3280a0fb646c6aff20d3b981b842ae5a39bd0c5e2dce1eada4769e", "dotnet|2.1|product-version": "2.1.28", "dotnet|3.1|product-version": "3.1.15", "dotnet|5.0|product-version": "5.0.6", - "dotnet|6.0|product-version": "6.0.0-preview.3", + "dotnet|6.0|product-version": "6.0.0-preview.4", "monitor|5.0|build-version": "5.0.0-preview.4.21219.3", "monitor|5.0|product-version": "5.0.0-preview.4", @@ -56,12 +56,12 @@ "powershell|5.0|Linux|x64|sha": "537d885b79dd1cd183d14b5f5e71046558fb015f562bb817ee90fbabaa9b1039c822949b7e1a5c9b69a976eae09786e3b2c0f0586c01c822868cc48ea7e36620", "powershell|5.0|Windows|x64|sha": "6a390cddbc88fe9a645363ccec9819603cfb754b5dead3161197f45c4b248b6bd4176b369ded139d7f9d485105351395de07cd8e61ed4f22a9cdd34bfaff9fc5", - "powershell|6.0|build-version": "7.2.0-preview.3", - "powershell|6.0|Linux.Alpine|sha": "7bc19276798fe86a687c9d10e981e3478284619bf3d2a95827ef3370386ac0739674e4a882f66e90c122b1c7677714290b2b083f1035e4f66c65a1397ba05e23", - "powershell|6.0|Linux|arm32|sha": "dbd7555588f37143d22e521ccffdd557f14f769649933753dcec41b5e91592d1bcc46a5581f472a255d7144fb196fcd9da8db2747b2b5a22a21410083370a4a0", - "powershell|6.0|Linux|arm64|sha": "515a31acd364775e4fc9bec10c10a3f7cc386fdea63e361f54d8019ba35ba358b098130028ad415ce877c9b453d9f2f029fe6f7b505652c597040bba234f46ba", - "powershell|6.0|Linux|x64|sha": "2389165a6d25e4f533ba0baffa7686cf58b8e9c506378caf47f5a8a881a70d5a39fa81d0bbfbd4d9f1633160fae4a8a0f41c844b0ab20b87101327a91fd20578", - "powershell|6.0|Windows|x64|sha": "edf0073f7bea811b68cc54d0325990a4b28c583c11cac92914f9bd44bf7dead733f5833006d55e19d65d23864e90919826c86f061578889b30521fc5d70fd685", + "powershell|6.0|build-version": "7.2.0-preview.5", + "powershell|6.0|Linux.Alpine|sha": "5caa0c0c710740078df0dd6b02912bdf101006bd449642dec08e39730fa45c787988252d0667a438e03a8fd7c4e68d1692d8c259f54d4a3a83687fcaeb268394", + "powershell|6.0|Linux|arm32|sha": "3e143afe24cca7adcbdc37de4109acdd520ea46d052983a0dae672e7f99326aa2637af2beb42f4dcb65bd725f5bf8d3297e7b21eb23b725e775c5e0a600271e7", + "powershell|6.0|Linux|arm64|sha": "c18386b717567ec7aa52d161713225cd9fa782a77601b4fe829faece49ba3ceed7b8297e8be1dc8f8ac98e2bec1e92bce49c5f191ee90391bbb0c419453021b8", + "powershell|6.0|Linux|x64|sha": "2766efbeaba81f3fa47b3de57ae606b34f00eb6f63a7d58d678c52ce8ac9e6cdba3d89e964b149f7f58db7bbefc07e49a0d91d4957da1c04ca1d77714b27c767", + "powershell|6.0|Windows|x64|sha": "76fec0e3160bb9d19531cb95f7bd1fce07074f990bc2e2e35fe67b00460e034a24079d52aef0353070cecb8261721f1bb314bdd8919f52f788e6c48cadedbecd", "runtime|2.1|build-version": "2.1.28", "runtime|2.1|linux-musl|x64|sha": "a8e6f3e20b6ecc9bb8501ae61caadeecfcf7cb61343b1f4008138f2dcf15f23bad4c228d61f334b1dec5afb635d6bfb5aae01e82bc95a70af5509b51d2d40efe", @@ -85,14 +85,14 @@ "runtime|5.0|linux|arm64|sha": "2f7e8b2654655d0d816e4d2e775098c340edf5edb458af9598f33a72e340268136fe6e2516ad4cfe941d0d419fe30357756f6585bcc151110e37c710284570d8", "runtime|5.0|win|x64|sha": "93420194608a703e319e988c020e213b55ea331c2ec92ccf122c15bcfbfbcfe433fafe098c99db5033a1457b6d8c89a88b60d93baa04e59c51f6b665b1109fa1", - "runtime|6.0|build-version": "6.0.0-preview.3.21201.4", - "runtime|6.0|linux-musl|x64|sha": "02ef46d6d2812319734be36213d5a9276a79bc483f86e2312b26df94d7af3ad7b7bb7f512c92a022cbb64742743c945f601035bd6ce02ea77a3baedddcf1f740", - "runtime|6.0|linux-musl|arm|sha": "0f02c0ef041c47de6add3e8690d88bd787f24a6b62054899765eee73e25b75bcc185146bcfce6b8502aac29b6f0897935718260f6553b5dc9e7bd781c3fa58bc", - "runtime|6.0|linux-musl|arm64|sha": "635fa684a4dfffc0f4eaf1e6d383170e7ae17c3646df6e23d1b9d4e8cd790588059b0a54ee0bb46f04ef30de12605bbd9a42dab0d2315c514a4f4966fe9e56ae", - "runtime|6.0|linux|arm|sha": "02ede5efac794b181719642771156d5b9759f52d90fe7c05edc5e5ec6f9ee22fa03ebebce29f4aef0c74399d468429ac335cae2f636c87566f33d8c04be2604e", - "runtime|6.0|linux|x64|sha": "8a6623d4ab32b24ce7cc507582309f38735419e93992f7a0180494c09cf1ec7d597fa1fcc23c90efedf6be1b1a47d36e9061c998d2713e40bbd94b61649f7ff9", - "runtime|6.0|linux|arm64|sha": "8a5f4d26d8b98adb6402e6e1fff21ee1cfdca42dfc5a596d59c79cabd154d1756db5269e6f6e0671911bdeaebbb1047a449298abbac049686741ae70802ce31c", - "runtime|6.0|win|x64|sha": "c6eaafce3eb7dc97fe3104d31c36b6c6d9c8b34eb61f7d286c7e2c1a640f1cbd150fa5ff2db19664baa2701048803011e582c9e9524246384bfdd386676fdade", + "runtime|6.0|build-version": "6.0.0-preview.4.21253.7", + "runtime|6.0|linux-musl|x64|sha": "5e837bafe7a5027e0b7abf9f68724d39dd4aa7f04ef3e04de3304848ffb7f50fa3b975ca08163a7b1e84fc1945061516ed617b224539ff159c31674ad12702e0", + "runtime|6.0|linux-musl|arm|sha": "2cb28f12114248fd6e068d80f249dc322d5c1d889d4cda663528224face978916c2e820fe7eddaf5239da146f804cab62efb2309f186815a26e894523ab396ce", + "runtime|6.0|linux-musl|arm64|sha": "711f9d17219b71dabcad305f3cb5f5a9c25891908ae9410ca8af3d3afba932473daca2a221fdf7338ec08875770f7d166a0836c287bc5b7c1bd856a0347d975d", + "runtime|6.0|linux|arm|sha": "9006314540937845adb3e8746fda48037bbbfb28cd76eeb66655d1d1a92014d979256cb78b08f5f85fe8b5b8952a10b3c152be99b7dda3b2bfe1ecec5935126d", + "runtime|6.0|linux|x64|sha": "baa7a1f8ea64ff93850b4e9ef44ba3af2e7ea8dd72354e70a73147e630fca97fb8e7f4f7ef963b0f7067baaf26c29e002a330663d32ee2cfe3bd2a0049841f6b", + "runtime|6.0|linux|arm64|sha": "69b97e6e2a98acf0dc81ceeed4bb4ff098edcdad7ce459068c1ba4393f3e6db7d6f4df75c7e41da65ac984daa9ade8a14b8277175ac695737a2a03406598c541", + "runtime|6.0|win|x64|sha": "2d5e22a35dcd1d8478815a3ca1dedf47cce881f40e78375f8a759e31f4a6527cc601acda1c8066e7c1441243561b6cbadd4a04d41c00bdf3c66e84789baf7e22", "sdk|2.1|build-version": "2.1.816", "sdk|2.1|product-version": "2.1.816", @@ -117,14 +117,14 @@ "sdk|5.0|linux|x64|sha": "49d8f0414806a9c938192ed13e7707ac2609ca6c2dc408d616e56e98fc0a954b1aa3f569858f7ba38fb79b2ee36dc1920c7f08d1ba4f93da501542b1c8a1320f", "sdk|5.0|win|x64|sha": "762ad53d66b893cb2cdf61540794a4a1e20b127e371f57f912ad8ebd4102aabf32366ebaabfe90aa362c1fae0bec0aa7ac6af35c6c0153fb913cd4c532149238", - "sdk|6.0|build-version": "6.0.100-preview.3.21202.5", - "sdk|6.0|product-version": "6.0.100-preview.3", - "sdk|6.0|linux-musl|arm|sha": "c8ca2541bef18298ea5744bbc2c5a9271d0f34e593956bda1337a22d4d16d9644349e804d793886681bab5774f2983142c7dc9e723a236c53f34c9c7181ac3ab", - "sdk|6.0|linux-musl|arm64|sha": "1ec6f1c367f43bdce124db5de864639a2d8287e8029da8994e4069fe53b4eef93c7a688178375da09b7eee721aade4996fd5b760f4e7e1cd41faface14844ea0", - "sdk|6.0|linux-musl|x64|sha": "1713b4d2e237122d11e54bdaa6cc14dd64a485212493adaf6ccb09b821cef1893c6685b1c6ec32523f2e9f7ca743b051f52133552a1c7dc34d5539b27b05628c", - "sdk|6.0|linux|arm|sha": "feff4ca8600c48482a4a4cf2863d16e36c4a33e46b1b56567e8acf7599d7ea71feb2bb1715a43e989c26148ea2c5024353114e687c290632fa12f18d184a5ca9", - "sdk|6.0|linux|arm64|sha": "ee658e35f7917c5681d1f71ad3f82f4f2975d66a9b747ec5b5d58629b75c22fb6f31532b5423ad75b2e92ef333179948b52dd5507eadd9f3431e5638d98268d9", - "sdk|6.0|linux|x64|sha": "f776177c1ca2b672cf05f9ec32f20ef35a039dd8d31beaa139d1e47d71cca4ccf0f2a61bbf006a781e693977ee91cc9e08e12134ffb4c7a03a8e56c163b8661d", - "sdk|6.0|win|x64|sha": "38fc6d76ef0d2331fcc32319be17edf4887443ad7504131041a12026340f7418227b85aa597d7ecb6c4a57cfd928004c6511455cedc6dcee42284793f66146cf" + "sdk|6.0|build-version": "6.0.100-preview.4.21255.9", + "sdk|6.0|product-version": "6.0.100-preview.4", + "sdk|6.0|linux-musl|arm|sha": "4f677ceeb3f6dd2d92c6865d6864619519dd44284f52fe5ad7534b2d5894e5342152a835b2dbf16dbcc954b49e5dc72037eef2fb0c7a4af94a89f4fa6a0c6db9", + "sdk|6.0|linux-musl|arm64|sha": "f2046f3fb7513da68c628faf119830e9618e19858b0b608fb38df91ee060b642243e89221f622fe4c7c09a745bc997611d4deed5ed9d1a2a2de08c864df67467", + "sdk|6.0|linux-musl|x64|sha": "101db50031fffb064d6ed86c496762c0cb19c0fb32e5650d1965f005b256e5401c6e7665506eaadf972eee61962d4a1e8c2f55ed033b82fea6f458ad59230338", + "sdk|6.0|linux|arm|sha": "5207f2842ec70fc6b428e20d25fe9b11202c593db8095b04d8f67a1ab2f445675229faa6eca9f07746d98a70f2cb891b5c6f65a1fd559ee1b8201be98d34e481", + "sdk|6.0|linux|arm64|sha": "40dbb1cf48f7f27ba95e36b5638ce5529cdba8bbfb03b2ad84e03924067f17ecc1de12132a66bb07f6b432d247bfb80e86cda7f7832d34565b880acc65940321", + "sdk|6.0|linux|x64|sha": "9b4554f9c223ff70083618da7c12a70686d39f7b413583c6a7449bfbb5e871ef281b3f692eefca53864ea57217685bf4d7f80383015b2462666a0a26376e0f97", + "sdk|6.0|win|x64|sha": "0dce469c5b6d4a83555e966556c5b8c12f6598f14a5221c5757f77e874f39834d7342fbb0ec928eb659ab8685b944b6845e17495df4a5a2eca83b9986f716c27" } } diff --git a/src/aspnet/6.0/alpine3.13/amd64/Dockerfile b/src/aspnet/6.0/alpine3.13/amd64/Dockerfile index aeb3c3e030..a07329eb3a 100644 --- a/src/aspnet/6.0/alpine3.13/amd64/Dockerfile +++ b/src/aspnet/6.0/alpine3.13/amd64/Dockerfile @@ -1,11 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM $REPO:6.0-alpine3.13-amd64 -# Install ASP.NET Core -ENV ASPNET_VERSION=6.0.0-preview.3.21201.13 +ENV \ + # ASP.NET Core version + ASPNET_VERSION=6.0.0-preview.4.21253.5 \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json +# Install ASP.NET Core RUN wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-musl-x64.tar.gz \ - && aspnetcore_sha512='80d451713218d1d0ce89d5d0e5205d82811e0a58aac299403cb7fd305f5f70acbe3b21854d2ff85d7666a48a083571c7ea661c7499f8900cac6571732876f831' \ + && aspnetcore_sha512='861d46655f58d911a63410cda1641852bc578fc4565462a690629ee835074f9f52e0c9922180b4df79aab4283c9ba474db626629d57627ca2a05b75edba9d247' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz diff --git a/src/aspnet/6.0/alpine3.13/arm32v7/Dockerfile b/src/aspnet/6.0/alpine3.13/arm32v7/Dockerfile index b15103a4e0..fb3591f25e 100644 --- a/src/aspnet/6.0/alpine3.13/arm32v7/Dockerfile +++ b/src/aspnet/6.0/alpine3.13/arm32v7/Dockerfile @@ -1,11 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM $REPO:6.0-alpine3.13-arm32v7 -# Install ASP.NET Core -ENV ASPNET_VERSION=6.0.0-preview.1.21103.6 +ENV \ + # ASP.NET Core version + ASPNET_VERSION=6.0.0-preview.4.21253.5 \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json +# Install ASP.NET Core RUN wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-musl-arm.tar.gz \ - && aspnetcore_sha512='f7a8bf0cdc06044d3e5a523dcc65132883ed7fc94cc71862838d4c7cb78c49484ec254324f92576292946a33b151590a9a24b50ae162abbd7980ee71a324741b' \ + && aspnetcore_sha512='e829ccc67d4c00a790d4d898b1d0541020fbc1f00dce4c311191c4684cfd6788746cd171512348f265c80b768b877ba912cf0709efbad9ee4aa7cf6442576eae' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz diff --git a/src/aspnet/6.0/alpine3.13/arm64v8/Dockerfile b/src/aspnet/6.0/alpine3.13/arm64v8/Dockerfile index fa4984031d..8b1837c7e2 100644 --- a/src/aspnet/6.0/alpine3.13/arm64v8/Dockerfile +++ b/src/aspnet/6.0/alpine3.13/arm64v8/Dockerfile @@ -1,11 +1,15 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM $REPO:6.0-alpine3.13-arm64v8 -# Install ASP.NET Core -ENV ASPNET_VERSION=6.0.0-preview.3.21201.13 +ENV \ + # ASP.NET Core version + ASPNET_VERSION=6.0.0-preview.4.21253.5 \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json +# Install ASP.NET Core RUN wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-musl-arm64.tar.gz \ - && aspnetcore_sha512='09211c57972a5b2751cf6ba8947d62088974e73fdd1db4e52674dd460dc743ed58180e89434563170b99d735eec0fb88ac4c641076cbfe618c5d83a7708d9925' \ + && aspnetcore_sha512='9ea8cf9b8e2b81dc25b01ad55ea97de9e68d721c2643283b83009601a0f4c4bcc98b18bbf21474638380ee9abede795ce266b5c0b5f1e3dd0c265ae131d7858d' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz diff --git a/src/aspnet/6.0/bullseye-slim/amd64/Dockerfile b/src/aspnet/6.0/bullseye-slim/amd64/Dockerfile index b1e53034df..7871fd14ce 100644 --- a/src/aspnet/6.0/bullseye-slim/amd64/Dockerfile +++ b/src/aspnet/6.0/bullseye-slim/amd64/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM amd64/buildpack-deps:bullseye-curl as installer @@ -7,7 +7,7 @@ ARG ASPNET_VERSION # Retrieve ASP.NET Core RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-x64.tar.gz \ - && aspnetcore_sha512='05abefd3c1c8f0ffb911e270cf949be144af660e5755af3b1801db4d41beb7234b889ecf1fbb3aeb9f3b51324b4b225c4adc8537fd2f16d61829bd91713f8f1f' \ + && aspnetcore_sha512='249db1382db95b9e60e4068c253c5381b2b37f30cf815471b623584b690a09ae5f04ef4085e02d2a2950041682188997b1f8e39bad6d5ecc05fb239576ffc1f7' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz @@ -17,6 +17,10 @@ RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/a FROM $REPO:6.0-bullseye-slim-amd64 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV \ + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/bullseye-slim/arm32v7/Dockerfile b/src/aspnet/6.0/bullseye-slim/arm32v7/Dockerfile index 1374e42095..8a5db9efbd 100644 --- a/src/aspnet/6.0/bullseye-slim/arm32v7/Dockerfile +++ b/src/aspnet/6.0/bullseye-slim/arm32v7/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM arm32v7/buildpack-deps:bullseye-curl as installer @@ -7,7 +7,7 @@ ARG ASPNET_VERSION # Retrieve ASP.NET Core RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-arm.tar.gz \ - && aspnetcore_sha512='8514f9455e38c8640f650534742f77b892f0cf6ab4968df702acd9f44afda2a5ae98557d2c4482316c3268ec4bf1f78dcb40e4c729afad77030f45bcad3cffda' \ + && aspnetcore_sha512='6d4741f71ae38e5864f54c7cbb42dcef85727e631771a7789ecc7307e1c74fd90d9dcc543329de7b51786472c77c60d9d39368faa5e9431708c56ae2ec16a20c' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz @@ -17,6 +17,10 @@ RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/a FROM $REPO:6.0-bullseye-slim-arm32v7 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV \ + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/bullseye-slim/arm64v8/Dockerfile b/src/aspnet/6.0/bullseye-slim/arm64v8/Dockerfile index 9ae29fb133..3270e22a5b 100644 --- a/src/aspnet/6.0/bullseye-slim/arm64v8/Dockerfile +++ b/src/aspnet/6.0/bullseye-slim/arm64v8/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM arm64v8/buildpack-deps:bullseye-curl as installer @@ -7,7 +7,7 @@ ARG ASPNET_VERSION # Retrieve ASP.NET Core RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-arm64.tar.gz \ - && aspnetcore_sha512='9006cd8a03d03cdbaa2ab9ac76e370fcec9afa77cc6a333eb08468a2fc456fbd36da14b9992102d948f8e698f3370dde6d1568a99912898a19b42d30193bb5f1' \ + && aspnetcore_sha512='ab0aa51b272ebcaeb61e1a24e8385b8e4b7ad807576ebdf2ceb76077e517156f6a4f7303cc54198965f98647b99fdb62b6a6f6465e7ed183662561f918664b0a' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz @@ -17,6 +17,10 @@ RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/a FROM $REPO:6.0-bullseye-slim-arm64v8 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV \ + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/focal/amd64/Dockerfile b/src/aspnet/6.0/focal/amd64/Dockerfile index ad0ad82129..1b713f0b79 100644 --- a/src/aspnet/6.0/focal/amd64/Dockerfile +++ b/src/aspnet/6.0/focal/amd64/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM amd64/buildpack-deps:focal-curl as installer @@ -7,7 +7,7 @@ ARG ASPNET_VERSION # Retrieve ASP.NET Core RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-x64.tar.gz \ - && aspnetcore_sha512='05abefd3c1c8f0ffb911e270cf949be144af660e5755af3b1801db4d41beb7234b889ecf1fbb3aeb9f3b51324b4b225c4adc8537fd2f16d61829bd91713f8f1f' \ + && aspnetcore_sha512='249db1382db95b9e60e4068c253c5381b2b37f30cf815471b623584b690a09ae5f04ef4085e02d2a2950041682188997b1f8e39bad6d5ecc05fb239576ffc1f7' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz @@ -17,6 +17,10 @@ RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/a FROM $REPO:6.0-focal-amd64 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV \ + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/focal/arm32v7/Dockerfile b/src/aspnet/6.0/focal/arm32v7/Dockerfile index 8207576d6d..d345448e51 100644 --- a/src/aspnet/6.0/focal/arm32v7/Dockerfile +++ b/src/aspnet/6.0/focal/arm32v7/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM arm32v7/buildpack-deps:focal-curl as installer @@ -7,7 +7,7 @@ ARG ASPNET_VERSION # Retrieve ASP.NET Core RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-arm.tar.gz \ - && aspnetcore_sha512='8514f9455e38c8640f650534742f77b892f0cf6ab4968df702acd9f44afda2a5ae98557d2c4482316c3268ec4bf1f78dcb40e4c729afad77030f45bcad3cffda' \ + && aspnetcore_sha512='6d4741f71ae38e5864f54c7cbb42dcef85727e631771a7789ecc7307e1c74fd90d9dcc543329de7b51786472c77c60d9d39368faa5e9431708c56ae2ec16a20c' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz @@ -17,6 +17,10 @@ RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/a FROM $REPO:6.0-focal-arm32v7 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV \ + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/focal/arm64v8/Dockerfile b/src/aspnet/6.0/focal/arm64v8/Dockerfile index df7273f002..642030e416 100644 --- a/src/aspnet/6.0/focal/arm64v8/Dockerfile +++ b/src/aspnet/6.0/focal/arm64v8/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM arm64v8/buildpack-deps:focal-curl as installer @@ -7,7 +7,7 @@ ARG ASPNET_VERSION # Retrieve ASP.NET Core RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNET_VERSION/aspnetcore-runtime-$ASPNET_VERSION-linux-arm64.tar.gz \ - && aspnetcore_sha512='9006cd8a03d03cdbaa2ab9ac76e370fcec9afa77cc6a333eb08468a2fc456fbd36da14b9992102d948f8e698f3370dde6d1568a99912898a19b42d30193bb5f1' \ + && aspnetcore_sha512='ab0aa51b272ebcaeb61e1a24e8385b8e4b7ad807576ebdf2ceb76077e517156f6a4f7303cc54198965f98647b99fdb62b6a6f6465e7ed183662561f918664b0a' \ && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ && tar -ozxf aspnetcore.tar.gz ./shared/Microsoft.AspNetCore.App \ && rm aspnetcore.tar.gz @@ -17,6 +17,10 @@ RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/a FROM $REPO:6.0-focal-arm64v8 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV \ + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION \ + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/nanoserver-1809/amd64/Dockerfile b/src/aspnet/6.0/nanoserver-1809/amd64/Dockerfile index 86a44021dd..f0a002eee1 100644 --- a/src/aspnet/6.0/nanoserver-1809/amd64/Dockerfile +++ b/src/aspnet/6.0/nanoserver-1809/amd64/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM mcr.microsoft.com/windows/servercore:1809-amd64 AS installer @@ -11,7 +11,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Install ASP.NET Core Runtime RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$Env:ASPNET_VERSION/aspnetcore-runtime-$Env:ASPNET_VERSION-win-x64.zip; ` - $aspnetcore_sha512 = '845dd47a19169916a5bfc509f900cdd5309abf99f608a8a9cd6122e7393aec394c811ea7425de53e614e302304500fd98bedaae52c72551ba7d9c055d4610043'; ` + $aspnetcore_sha512 = '0c5900bf14a911da5e1de3e8d19bb4508439fb08fea743b47ca7523a0586261fc253ff509c3280a0fb646c6aff20d3b981b842ae5a39bd0c5e2dce1eada4769e'; ` if ((Get-FileHash aspnetcore.zip -Algorithm sha512).Hash -ne $aspnetcore_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -26,6 +26,10 @@ RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/do FROM $REPO:6.0-nanoserver-1809 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV ` + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION ` + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/nanoserver-2004/amd64/Dockerfile b/src/aspnet/6.0/nanoserver-2004/amd64/Dockerfile index 2bee8a2b18..4aaf3518c1 100644 --- a/src/aspnet/6.0/nanoserver-2004/amd64/Dockerfile +++ b/src/aspnet/6.0/nanoserver-2004/amd64/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM mcr.microsoft.com/windows/servercore:2004-amd64 AS installer @@ -11,7 +11,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Install ASP.NET Core Runtime RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$Env:ASPNET_VERSION/aspnetcore-runtime-$Env:ASPNET_VERSION-win-x64.zip; ` - $aspnetcore_sha512 = '845dd47a19169916a5bfc509f900cdd5309abf99f608a8a9cd6122e7393aec394c811ea7425de53e614e302304500fd98bedaae52c72551ba7d9c055d4610043'; ` + $aspnetcore_sha512 = '0c5900bf14a911da5e1de3e8d19bb4508439fb08fea743b47ca7523a0586261fc253ff509c3280a0fb646c6aff20d3b981b842ae5a39bd0c5e2dce1eada4769e'; ` if ((Get-FileHash aspnetcore.zip -Algorithm sha512).Hash -ne $aspnetcore_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -26,6 +26,10 @@ RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/do FROM $REPO:6.0-nanoserver-2004 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV ` + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION ` + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/nanoserver-20H2/amd64/Dockerfile b/src/aspnet/6.0/nanoserver-20H2/amd64/Dockerfile index 64568e61f5..9e097dcb24 100644 --- a/src/aspnet/6.0/nanoserver-20H2/amd64/Dockerfile +++ b/src/aspnet/6.0/nanoserver-20H2/amd64/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/runtime -ARG ASPNET_VERSION=6.0.0-preview.3.21201.13 +ARG ASPNET_VERSION=6.0.0-preview.4.21253.5 # Installer image FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer @@ -11,7 +11,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Install ASP.NET Core Runtime RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$Env:ASPNET_VERSION/aspnetcore-runtime-$Env:ASPNET_VERSION-win-x64.zip; ` - $aspnetcore_sha512 = '845dd47a19169916a5bfc509f900cdd5309abf99f608a8a9cd6122e7393aec394c811ea7425de53e614e302304500fd98bedaae52c72551ba7d9c055d4610043'; ` + $aspnetcore_sha512 = '0c5900bf14a911da5e1de3e8d19bb4508439fb08fea743b47ca7523a0586261fc253ff509c3280a0fb646c6aff20d3b981b842ae5a39bd0c5e2dce1eada4769e'; ` if ((Get-FileHash aspnetcore.zip -Algorithm sha512).Hash -ne $aspnetcore_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -26,6 +26,10 @@ RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/do FROM $REPO:6.0-nanoserver-20H2 ARG ASPNET_VERSION -ENV ASPNET_VERSION=$ASPNET_VERSION +ENV ` + # ASP.NET Core version + ASPNET_VERSION=$ASPNET_VERSION ` + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/6.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/aspnet/6.0/windowsservercore-ltsc2019/amd64/Dockerfile index fae7ff0caa..872520d5e0 100644 --- a/src/aspnet/6.0/windowsservercore-ltsc2019/amd64/Dockerfile +++ b/src/aspnet/6.0/windowsservercore-ltsc2019/amd64/Dockerfile @@ -3,7 +3,11 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM $REPO:6.0-windowsservercore-ltsc2019 -ENV ASPNET_VERSION=6.0.0-preview.3.21201.13 +ENV ` + # ASP.NET Core version + ASPNET_VERSION=6.0.0-preview.4.21253.5 ` + # Set the default console formatter to JSON + Logging__Console__FormatterName=Json RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` @@ -11,7 +15,7 @@ RUN powershell -Command ` ` # Install ASP.NET Core Runtime Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$Env:ASPNET_VERSION/aspnetcore-runtime-$Env:ASPNET_VERSION-win-x64.zip; ` - $aspnetcore_sha512 = '845dd47a19169916a5bfc509f900cdd5309abf99f608a8a9cd6122e7393aec394c811ea7425de53e614e302304500fd98bedaae52c72551ba7d9c055d4610043'; ` + $aspnetcore_sha512 = '0c5900bf14a911da5e1de3e8d19bb4508439fb08fea743b47ca7523a0586261fc253ff509c3280a0fb646c6aff20d3b981b842ae5a39bd0c5e2dce1eada4769e'; ` if ((Get-FileHash aspnetcore.zip -Algorithm sha512).Hash -ne $aspnetcore_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/runtime-deps/6.0/alpine3.13/arm32v7/Dockerfile b/src/runtime-deps/6.0/alpine3.13/arm32v7/Dockerfile new file mode 100644 index 0000000000..bff0d80004 --- /dev/null +++ b/src/runtime-deps/6.0/alpine3.13/arm32v7/Dockerfile @@ -0,0 +1,20 @@ +FROM arm32v7/alpine:3.13 + +RUN apk add --no-cache \ + ca-certificates \ + \ + # .NET Core dependencies + krb5-libs \ + libgcc \ + libintl \ + libssl1.1 \ + libstdc++ \ + zlib + +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 \ + # Set the invariant mode since icu_libs isn't included (see https://github.com/dotnet/announcements/issues/20) + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true diff --git a/src/runtime/6.0/alpine3.13/amd64/Dockerfile b/src/runtime/6.0/alpine3.13/amd64/Dockerfile index 6e529eb3f8..93d3073ba0 100644 --- a/src/runtime/6.0/alpine3.13/amd64/Dockerfile +++ b/src/runtime/6.0/alpine3.13/amd64/Dockerfile @@ -2,10 +2,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM $REPO:6.0-alpine3.13-amd64 # Install .NET -ENV DOTNET_VERSION=6.0.0-preview.3.21201.4 +ENV DOTNET_VERSION=6.0.0-preview.4.21253.7 RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-musl-x64.tar.gz \ - && dotnet_sha512='02ef46d6d2812319734be36213d5a9276a79bc483f86e2312b26df94d7af3ad7b7bb7f512c92a022cbb64742743c945f601035bd6ce02ea77a3baedddcf1f740' \ + && dotnet_sha512='5e837bafe7a5027e0b7abf9f68724d39dd4aa7f04ef3e04de3304848ffb7f50fa3b975ca08163a7b1e84fc1945061516ed617b224539ff159c31674ad12702e0' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ diff --git a/src/runtime/6.0/alpine3.13/arm32v7/Dockerfile b/src/runtime/6.0/alpine3.13/arm32v7/Dockerfile index e7319b2d4c..68607e76ac 100644 --- a/src/runtime/6.0/alpine3.13/arm32v7/Dockerfile +++ b/src/runtime/6.0/alpine3.13/arm32v7/Dockerfile @@ -2,10 +2,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM $REPO:6.0-alpine3.13-arm32v7 # Install .NET -ENV DOTNET_VERSION=6.0.0-preview.1.21102.12 +ENV DOTNET_VERSION=6.0.0-preview.4.21253.7 RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-musl-arm.tar.gz \ - && dotnet_sha512='ec5f222ee0989a92f041796ba7bfbb82d8773839dc7233014469cc856e107943f1426e04ce2655421a93055753844a1ae667ff4d95f9bbfd741395bf72bce58a' \ + && dotnet_sha512='2cb28f12114248fd6e068d80f249dc322d5c1d889d4cda663528224face978916c2e820fe7eddaf5239da146f804cab62efb2309f186815a26e894523ab396ce' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ diff --git a/src/runtime/6.0/alpine3.13/arm64v8/Dockerfile b/src/runtime/6.0/alpine3.13/arm64v8/Dockerfile index e252434f3a..038243a0ab 100644 --- a/src/runtime/6.0/alpine3.13/arm64v8/Dockerfile +++ b/src/runtime/6.0/alpine3.13/arm64v8/Dockerfile @@ -2,10 +2,10 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM $REPO:6.0-alpine3.13-arm64v8 # Install .NET -ENV DOTNET_VERSION=6.0.0-preview.3.21201.4 +ENV DOTNET_VERSION=6.0.0-preview.4.21253.7 RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-musl-arm64.tar.gz \ - && dotnet_sha512='635fa684a4dfffc0f4eaf1e6d383170e7ae17c3646df6e23d1b9d4e8cd790588059b0a54ee0bb46f04ef30de12605bbd9a42dab0d2315c514a4f4966fe9e56ae' \ + && dotnet_sha512='711f9d17219b71dabcad305f3cb5f5a9c25891908ae9410ca8af3d3afba932473daca2a221fdf7338ec08875770f7d166a0836c287bc5b7c1bd856a0347d975d' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ diff --git a/src/runtime/6.0/bullseye-slim/amd64/Dockerfile b/src/runtime/6.0/bullseye-slim/amd64/Dockerfile index 71a2afe989..ce69f3d185 100644 --- a/src/runtime/6.0/bullseye-slim/amd64/Dockerfile +++ b/src/runtime/6.0/bullseye-slim/amd64/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM amd64/buildpack-deps:bullseye-curl as installer @@ -7,7 +7,7 @@ ARG DOTNET_VERSION # Retrieve .NET RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='8a6623d4ab32b24ce7cc507582309f38735419e93992f7a0180494c09cf1ec7d597fa1fcc23c90efedf6be1b1a47d36e9061c998d2713e40bbd94b61649f7ff9' \ + && dotnet_sha512='baa7a1f8ea64ff93850b4e9ef44ba3af2e7ea8dd72354e70a73147e630fca97fb8e7f4f7ef963b0f7067baaf26c29e002a330663d32ee2cfe3bd2a0049841f6b' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /dotnet \ && tar -ozxf dotnet.tar.gz -C /dotnet \ diff --git a/src/runtime/6.0/bullseye-slim/arm32v7/Dockerfile b/src/runtime/6.0/bullseye-slim/arm32v7/Dockerfile index 2bd7d73ca4..5add1869ed 100644 --- a/src/runtime/6.0/bullseye-slim/arm32v7/Dockerfile +++ b/src/runtime/6.0/bullseye-slim/arm32v7/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM arm32v7/buildpack-deps:bullseye-curl as installer @@ -7,7 +7,7 @@ ARG DOTNET_VERSION # Retrieve .NET RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-arm.tar.gz \ - && dotnet_sha512='02ede5efac794b181719642771156d5b9759f52d90fe7c05edc5e5ec6f9ee22fa03ebebce29f4aef0c74399d468429ac335cae2f636c87566f33d8c04be2604e' \ + && dotnet_sha512='9006314540937845adb3e8746fda48037bbbfb28cd76eeb66655d1d1a92014d979256cb78b08f5f85fe8b5b8952a10b3c152be99b7dda3b2bfe1ecec5935126d' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /dotnet \ && tar -ozxf dotnet.tar.gz -C /dotnet \ diff --git a/src/runtime/6.0/bullseye-slim/arm64v8/Dockerfile b/src/runtime/6.0/bullseye-slim/arm64v8/Dockerfile index 8a9c9e7cf9..8c9ca301c3 100644 --- a/src/runtime/6.0/bullseye-slim/arm64v8/Dockerfile +++ b/src/runtime/6.0/bullseye-slim/arm64v8/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM arm64v8/buildpack-deps:bullseye-curl as installer @@ -7,7 +7,7 @@ ARG DOTNET_VERSION # Retrieve .NET RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-arm64.tar.gz \ - && dotnet_sha512='8a5f4d26d8b98adb6402e6e1fff21ee1cfdca42dfc5a596d59c79cabd154d1756db5269e6f6e0671911bdeaebbb1047a449298abbac049686741ae70802ce31c' \ + && dotnet_sha512='69b97e6e2a98acf0dc81ceeed4bb4ff098edcdad7ce459068c1ba4393f3e6db7d6f4df75c7e41da65ac984daa9ade8a14b8277175ac695737a2a03406598c541' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /dotnet \ && tar -ozxf dotnet.tar.gz -C /dotnet \ diff --git a/src/runtime/6.0/focal/amd64/Dockerfile b/src/runtime/6.0/focal/amd64/Dockerfile index 0f8df94f51..e7e1b2313f 100644 --- a/src/runtime/6.0/focal/amd64/Dockerfile +++ b/src/runtime/6.0/focal/amd64/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM amd64/buildpack-deps:focal-curl as installer @@ -7,7 +7,7 @@ ARG DOTNET_VERSION # Retrieve .NET RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='8a6623d4ab32b24ce7cc507582309f38735419e93992f7a0180494c09cf1ec7d597fa1fcc23c90efedf6be1b1a47d36e9061c998d2713e40bbd94b61649f7ff9' \ + && dotnet_sha512='baa7a1f8ea64ff93850b4e9ef44ba3af2e7ea8dd72354e70a73147e630fca97fb8e7f4f7ef963b0f7067baaf26c29e002a330663d32ee2cfe3bd2a0049841f6b' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /dotnet \ && tar -ozxf dotnet.tar.gz -C /dotnet \ diff --git a/src/runtime/6.0/focal/arm32v7/Dockerfile b/src/runtime/6.0/focal/arm32v7/Dockerfile index 4ed056f42d..2b9ecd8f42 100644 --- a/src/runtime/6.0/focal/arm32v7/Dockerfile +++ b/src/runtime/6.0/focal/arm32v7/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM arm32v7/buildpack-deps:focal-curl as installer @@ -7,7 +7,7 @@ ARG DOTNET_VERSION # Retrieve .NET RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-arm.tar.gz \ - && dotnet_sha512='02ede5efac794b181719642771156d5b9759f52d90fe7c05edc5e5ec6f9ee22fa03ebebce29f4aef0c74399d468429ac335cae2f636c87566f33d8c04be2604e' \ + && dotnet_sha512='9006314540937845adb3e8746fda48037bbbfb28cd76eeb66655d1d1a92014d979256cb78b08f5f85fe8b5b8952a10b3c152be99b7dda3b2bfe1ecec5935126d' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /dotnet \ && tar -ozxf dotnet.tar.gz -C /dotnet \ diff --git a/src/runtime/6.0/focal/arm64v8/Dockerfile b/src/runtime/6.0/focal/arm64v8/Dockerfile index 2e63242582..e18e66afe6 100644 --- a/src/runtime/6.0/focal/arm64v8/Dockerfile +++ b/src/runtime/6.0/focal/arm64v8/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM arm64v8/buildpack-deps:focal-curl as installer @@ -7,7 +7,7 @@ ARG DOTNET_VERSION # Retrieve .NET RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-arm64.tar.gz \ - && dotnet_sha512='8a5f4d26d8b98adb6402e6e1fff21ee1cfdca42dfc5a596d59c79cabd154d1756db5269e6f6e0671911bdeaebbb1047a449298abbac049686741ae70802ce31c' \ + && dotnet_sha512='69b97e6e2a98acf0dc81ceeed4bb4ff098edcdad7ce459068c1ba4393f3e6db7d6f4df75c7e41da65ac984daa9ade8a14b8277175ac695737a2a03406598c541' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /dotnet \ && tar -ozxf dotnet.tar.gz -C /dotnet \ diff --git a/src/runtime/6.0/nanoserver-1809/amd64/Dockerfile b/src/runtime/6.0/nanoserver-1809/amd64/Dockerfile index ee3d1550c8..ddc982ecb4 100644 --- a/src/runtime/6.0/nanoserver-1809/amd64/Dockerfile +++ b/src/runtime/6.0/nanoserver-1809/amd64/Dockerfile @@ -1,6 +1,6 @@ # escape=` -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM mcr.microsoft.com/windows/servercore:1809-amd64 AS installer @@ -10,7 +10,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Retrieve .NET Runtime RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-runtime-$Env:DOTNET_VERSION-win-x64.zip; ` - $dotnet_sha512 = 'c6eaafce3eb7dc97fe3104d31c36b6c6d9c8b34eb61f7d286c7e2c1a640f1cbd150fa5ff2db19664baa2701048803011e582c9e9524246384bfdd386676fdade'; ` + $dotnet_sha512 = '2d5e22a35dcd1d8478815a3ca1dedf47cce881f40e78375f8a759e31f4a6527cc601acda1c8066e7c1441243561b6cbadd4a04d41c00bdf3c66e84789baf7e22'; ` if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/runtime/6.0/nanoserver-2004/amd64/Dockerfile b/src/runtime/6.0/nanoserver-2004/amd64/Dockerfile index bc42513cea..0c8e2d1a26 100644 --- a/src/runtime/6.0/nanoserver-2004/amd64/Dockerfile +++ b/src/runtime/6.0/nanoserver-2004/amd64/Dockerfile @@ -1,6 +1,6 @@ # escape=` -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM mcr.microsoft.com/windows/servercore:2004-amd64 AS installer @@ -10,7 +10,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Retrieve .NET Runtime RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-runtime-$Env:DOTNET_VERSION-win-x64.zip; ` - $dotnet_sha512 = 'c6eaafce3eb7dc97fe3104d31c36b6c6d9c8b34eb61f7d286c7e2c1a640f1cbd150fa5ff2db19664baa2701048803011e582c9e9524246384bfdd386676fdade'; ` + $dotnet_sha512 = '2d5e22a35dcd1d8478815a3ca1dedf47cce881f40e78375f8a759e31f4a6527cc601acda1c8066e7c1441243561b6cbadd4a04d41c00bdf3c66e84789baf7e22'; ` if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/runtime/6.0/nanoserver-20H2/amd64/Dockerfile b/src/runtime/6.0/nanoserver-20H2/amd64/Dockerfile index 02fe4db9af..d52a84873b 100644 --- a/src/runtime/6.0/nanoserver-20H2/amd64/Dockerfile +++ b/src/runtime/6.0/nanoserver-20H2/amd64/Dockerfile @@ -1,6 +1,6 @@ # escape=` -ARG DOTNET_VERSION=6.0.0-preview.3.21201.4 +ARG DOTNET_VERSION=6.0.0-preview.4.21253.7 # Installer image FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer @@ -10,7 +10,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Retrieve .NET Runtime RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-runtime-$Env:DOTNET_VERSION-win-x64.zip; ` - $dotnet_sha512 = 'c6eaafce3eb7dc97fe3104d31c36b6c6d9c8b34eb61f7d286c7e2c1a640f1cbd150fa5ff2db19664baa2701048803011e582c9e9524246384bfdd386676fdade'; ` + $dotnet_sha512 = '2d5e22a35dcd1d8478815a3ca1dedf47cce881f40e78375f8a759e31f4a6527cc601acda1c8066e7c1441243561b6cbadd4a04d41c00bdf3c66e84789baf7e22'; ` if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/runtime/6.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/runtime/6.0/windowsservercore-ltsc2019/amd64/Dockerfile index 3788ea2bf7..f56a5fdbd2 100644 --- a/src/runtime/6.0/windowsservercore-ltsc2019/amd64/Dockerfile +++ b/src/runtime/6.0/windowsservercore-ltsc2019/amd64/Dockerfile @@ -15,7 +15,7 @@ ENV ` ASPNETCORE_URLS=http://+:80 ` # Enable detection of running in a container DOTNET_RUNNING_IN_CONTAINER=true ` - DOTNET_VERSION=6.0.0-preview.3.21201.4 + DOTNET_VERSION=6.0.0-preview.4.21253.7 # Install .NET RUN powershell -Command ` @@ -23,7 +23,7 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-runtime-$Env:DOTNET_VERSION-win-x64.zip; ` - $dotnet_sha512 = 'c6eaafce3eb7dc97fe3104d31c36b6c6d9c8b34eb61f7d286c7e2c1a640f1cbd150fa5ff2db19664baa2701048803011e582c9e9524246384bfdd386676fdade'; ` + $dotnet_sha512 = '2d5e22a35dcd1d8478815a3ca1dedf47cce881f40e78375f8a759e31f4a6527cc601acda1c8066e7c1441243561b6cbadd4a04d41c00bdf3c66e84789baf7e22'; ` if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/6.0/alpine3.13/amd64/Dockerfile b/src/sdk/6.0/alpine3.13/amd64/Dockerfile index 361240871a..8bbbd2934a 100644 --- a/src/sdk/6.0/alpine3.13/amd64/Dockerfile +++ b/src/sdk/6.0/alpine3.13/amd64/Dockerfile @@ -4,11 +4,18 @@ FROM $REPO:6.0-alpine3.13-amd64 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,7 +28,7 @@ RUN apk add --no-cache \ # Install .NET SDK RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-x64.tar.gz \ - && dotnet_sha512='1713b4d2e237122d11e54bdaa6cc14dd64a485212493adaf6ccb09b821cef1893c6685b1c6ec32523f2e9f7ca743b051f52133552a1c7dc34d5539b27b05628c' \ + && dotnet_sha512='101db50031fffb064d6ed86c496762c0cb19c0fb32e5650d1965f005b256e5401c6e7665506eaadf972eee61962d4a1e8c2f55ed033b82fea6f458ad59230338' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ @@ -30,9 +37,9 @@ RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK && dotnet help # Install PowerShell global tool -RUN powershell_version=7.2.0-preview.3 \ +RUN powershell_version=7.2.0-preview.5 \ && wget -O PowerShell.Linux.Alpine.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Linux.Alpine.$powershell_version.nupkg \ - && powershell_sha512='7bc19276798fe86a687c9d10e981e3478284619bf3d2a95827ef3370386ac0739674e4a882f66e90c122b1c7677714290b2b083f1035e4f66c65a1397ba05e23' \ + && powershell_sha512='5caa0c0c710740078df0dd6b02912bdf101006bd449642dec08e39730fa45c787988252d0667a438e03a8fd7c4e68d1692d8c259f54d4a3a83687fcaeb268394' \ && echo "$powershell_sha512 PowerShell.Linux.Alpine.$powershell_version.nupkg" | sha512sum -c - \ && mkdir -p /usr/share/powershell \ && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.Alpine \ diff --git a/src/sdk/6.0/alpine3.13/arm32v7/Dockerfile b/src/sdk/6.0/alpine3.13/arm32v7/Dockerfile index 12ffa56d99..0e0403a53c 100644 --- a/src/sdk/6.0/alpine3.13/arm32v7/Dockerfile +++ b/src/sdk/6.0/alpine3.13/arm32v7/Dockerfile @@ -4,11 +4,18 @@ FROM $REPO:6.0-alpine3.13-arm32v7 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.1.21103.13 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,10 +28,10 @@ RUN apk add --no-cache \ # Install .NET SDK RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-arm.tar.gz \ - && dotnet_sha512='31b3c2f696d8fb0c5c1a1fbd3202d66b603d740fc229b7db35c2b391b9add06342067744711decd2c75f22bf2d0b2db93c421c0bafc780bc21a38cf1df128fcb' \ + && dotnet_sha512='4f677ceeb3f6dd2d92c6865d6864619519dd44284f52fe5ad7534b2d5894e5342152a835b2dbf16dbcc954b49e5dc72037eef2fb0c7a4af94a89f4fa6a0c6db9' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ - && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm dotnet.tar.gz \ # Trigger first run experience by running arbitrary cmd && dotnet help diff --git a/src/sdk/6.0/alpine3.13/arm64v8/Dockerfile b/src/sdk/6.0/alpine3.13/arm64v8/Dockerfile index 6482bbba17..b5dc771fe1 100644 --- a/src/sdk/6.0/alpine3.13/arm64v8/Dockerfile +++ b/src/sdk/6.0/alpine3.13/arm64v8/Dockerfile @@ -4,11 +4,18 @@ FROM $REPO:6.0-alpine3.13-arm64v8 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,7 +28,7 @@ RUN apk add --no-cache \ # Install .NET SDK RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-arm64.tar.gz \ - && dotnet_sha512='1ec6f1c367f43bdce124db5de864639a2d8287e8029da8994e4069fe53b4eef93c7a688178375da09b7eee721aade4996fd5b760f4e7e1cd41faface14844ea0' \ + && dotnet_sha512='f2046f3fb7513da68c628faf119830e9618e19858b0b608fb38df91ee060b642243e89221f622fe4c7c09a745bc997611d4deed5ed9d1a2a2de08c864df67467' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ diff --git a/src/sdk/6.0/bullseye-slim/amd64/Dockerfile b/src/sdk/6.0/bullseye-slim/amd64/Dockerfile index 77f287f894..673ece5b4a 100644 --- a/src/sdk/6.0/bullseye-slim/amd64/Dockerfile +++ b/src/sdk/6.0/bullseye-slim/amd64/Dockerfile @@ -4,9 +4,16 @@ FROM $REPO:6.0-bullseye-slim-amd64 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,7 +28,7 @@ RUN apt-get update \ # Install .NET SDK RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='f776177c1ca2b672cf05f9ec32f20ef35a039dd8d31beaa139d1e47d71cca4ccf0f2a61bbf006a781e693977ee91cc9e08e12134ffb4c7a03a8e56c163b8661d' \ + && dotnet_sha512='9b4554f9c223ff70083618da7c12a70686d39f7b413583c6a7449bfbb5e871ef281b3f692eefca53864ea57217685bf4d7f80383015b2462666a0a26376e0f97' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ @@ -30,9 +37,9 @@ RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$ && dotnet help # Install PowerShell global tool -RUN powershell_version=7.2.0-preview.3 \ +RUN powershell_version=7.2.0-preview.5 \ && curl -SL --output PowerShell.Linux.x64.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \ - && powershell_sha512='2389165a6d25e4f533ba0baffa7686cf58b8e9c506378caf47f5a8a881a70d5a39fa81d0bbfbd4d9f1633160fae4a8a0f41c844b0ab20b87101327a91fd20578' \ + && powershell_sha512='2766efbeaba81f3fa47b3de57ae606b34f00eb6f63a7d58d678c52ce8ac9e6cdba3d89e964b149f7f58db7bbefc07e49a0d91d4957da1c04ca1d77714b27c767' \ && echo "$powershell_sha512 PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \ && mkdir -p /usr/share/powershell \ && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \ diff --git a/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile b/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile index 3aef83f642..09ee7b7753 100644 --- a/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile +++ b/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile @@ -4,9 +4,16 @@ FROM $REPO:6.0-bullseye-slim-arm32v7 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,7 +28,7 @@ RUN apt-get update \ # Install .NET SDK RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-arm.tar.gz \ - && dotnet_sha512='feff4ca8600c48482a4a4cf2863d16e36c4a33e46b1b56567e8acf7599d7ea71feb2bb1715a43e989c26148ea2c5024353114e687c290632fa12f18d184a5ca9' \ + && dotnet_sha512='5207f2842ec70fc6b428e20d25fe9b11202c593db8095b04d8f67a1ab2f445675229faa6eca9f07746d98a70f2cb891b5c6f65a1fd559ee1b8201be98d34e481' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ @@ -30,9 +37,9 @@ RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$ && dotnet help # Install PowerShell global tool -RUN powershell_version=7.2.0-preview.3 \ +RUN powershell_version=7.2.0-preview.5 \ && curl -SL --output PowerShell.Linux.arm32.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \ - && powershell_sha512='dbd7555588f37143d22e521ccffdd557f14f769649933753dcec41b5e91592d1bcc46a5581f472a255d7144fb196fcd9da8db2747b2b5a22a21410083370a4a0' \ + && powershell_sha512='3e143afe24cca7adcbdc37de4109acdd520ea46d052983a0dae672e7f99326aa2637af2beb42f4dcb65bd725f5bf8d3297e7b21eb23b725e775c5e0a600271e7' \ && echo "$powershell_sha512 PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \ && mkdir -p /usr/share/powershell \ && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \ diff --git a/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile b/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile index e8cc281e83..cf0a717997 100644 --- a/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile +++ b/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile @@ -4,9 +4,16 @@ FROM $REPO:6.0-bullseye-slim-arm64v8 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,7 +28,7 @@ RUN apt-get update \ # Install .NET SDK RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-arm64.tar.gz \ - && dotnet_sha512='ee658e35f7917c5681d1f71ad3f82f4f2975d66a9b747ec5b5d58629b75c22fb6f31532b5423ad75b2e92ef333179948b52dd5507eadd9f3431e5638d98268d9' \ + && dotnet_sha512='40dbb1cf48f7f27ba95e36b5638ce5529cdba8bbfb03b2ad84e03924067f17ecc1de12132a66bb07f6b432d247bfb80e86cda7f7832d34565b880acc65940321' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ @@ -30,9 +37,9 @@ RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$ && dotnet help # Install PowerShell global tool -RUN powershell_version=7.2.0-preview.3 \ +RUN powershell_version=7.2.0-preview.5 \ && curl -SL --output PowerShell.Linux.arm64.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \ - && powershell_sha512='515a31acd364775e4fc9bec10c10a3f7cc386fdea63e361f54d8019ba35ba358b098130028ad415ce877c9b453d9f2f029fe6f7b505652c597040bba234f46ba' \ + && powershell_sha512='c18386b717567ec7aa52d161713225cd9fa782a77601b4fe829faece49ba3ceed7b8297e8be1dc8f8ac98e2bec1e92bce49c5f191ee90391bbb0c419453021b8' \ && echo "$powershell_sha512 PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \ && mkdir -p /usr/share/powershell \ && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \ diff --git a/src/sdk/6.0/focal/amd64/Dockerfile b/src/sdk/6.0/focal/amd64/Dockerfile index 6af43719ed..4e92a85417 100644 --- a/src/sdk/6.0/focal/amd64/Dockerfile +++ b/src/sdk/6.0/focal/amd64/Dockerfile @@ -4,9 +4,16 @@ FROM $REPO:6.0-focal-amd64 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,7 +28,7 @@ RUN apt-get update \ # Install .NET SDK RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='f776177c1ca2b672cf05f9ec32f20ef35a039dd8d31beaa139d1e47d71cca4ccf0f2a61bbf006a781e693977ee91cc9e08e12134ffb4c7a03a8e56c163b8661d' \ + && dotnet_sha512='9b4554f9c223ff70083618da7c12a70686d39f7b413583c6a7449bfbb5e871ef281b3f692eefca53864ea57217685bf4d7f80383015b2462666a0a26376e0f97' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ @@ -30,9 +37,9 @@ RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$ && dotnet help # Install PowerShell global tool -RUN powershell_version=7.2.0-preview.3 \ +RUN powershell_version=7.2.0-preview.5 \ && curl -SL --output PowerShell.Linux.x64.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \ - && powershell_sha512='2389165a6d25e4f533ba0baffa7686cf58b8e9c506378caf47f5a8a881a70d5a39fa81d0bbfbd4d9f1633160fae4a8a0f41c844b0ab20b87101327a91fd20578' \ + && powershell_sha512='2766efbeaba81f3fa47b3de57ae606b34f00eb6f63a7d58d678c52ce8ac9e6cdba3d89e964b149f7f58db7bbefc07e49a0d91d4957da1c04ca1d77714b27c767' \ && echo "$powershell_sha512 PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \ && mkdir -p /usr/share/powershell \ && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \ diff --git a/src/sdk/6.0/focal/arm32v7/Dockerfile b/src/sdk/6.0/focal/arm32v7/Dockerfile index 1544685795..d105e9e6ed 100644 --- a/src/sdk/6.0/focal/arm32v7/Dockerfile +++ b/src/sdk/6.0/focal/arm32v7/Dockerfile @@ -4,9 +4,16 @@ FROM $REPO:6.0-focal-arm32v7 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,7 +28,7 @@ RUN apt-get update \ # Install .NET SDK RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-arm.tar.gz \ - && dotnet_sha512='feff4ca8600c48482a4a4cf2863d16e36c4a33e46b1b56567e8acf7599d7ea71feb2bb1715a43e989c26148ea2c5024353114e687c290632fa12f18d184a5ca9' \ + && dotnet_sha512='5207f2842ec70fc6b428e20d25fe9b11202c593db8095b04d8f67a1ab2f445675229faa6eca9f07746d98a70f2cb891b5c6f65a1fd559ee1b8201be98d34e481' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ @@ -30,9 +37,9 @@ RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$ && dotnet help # Install PowerShell global tool -RUN powershell_version=7.2.0-preview.3 \ +RUN powershell_version=7.2.0-preview.5 \ && curl -SL --output PowerShell.Linux.arm32.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \ - && powershell_sha512='dbd7555588f37143d22e521ccffdd557f14f769649933753dcec41b5e91592d1bcc46a5581f472a255d7144fb196fcd9da8db2747b2b5a22a21410083370a4a0' \ + && powershell_sha512='3e143afe24cca7adcbdc37de4109acdd520ea46d052983a0dae672e7f99326aa2637af2beb42f4dcb65bd725f5bf8d3297e7b21eb23b725e775c5e0a600271e7' \ && echo "$powershell_sha512 PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \ && mkdir -p /usr/share/powershell \ && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \ diff --git a/src/sdk/6.0/focal/arm64v8/Dockerfile b/src/sdk/6.0/focal/arm64v8/Dockerfile index 0d4214c2da..660b0cd047 100644 --- a/src/sdk/6.0/focal/arm64v8/Dockerfile +++ b/src/sdk/6.0/focal/arm64v8/Dockerfile @@ -4,9 +4,16 @@ FROM $REPO:6.0-focal-arm64v8 ENV \ # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= \ - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage @@ -21,7 +28,7 @@ RUN apt-get update \ # Install .NET SDK RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-arm64.tar.gz \ - && dotnet_sha512='ee658e35f7917c5681d1f71ad3f82f4f2975d66a9b747ec5b5d58629b75c22fb6f31532b5423ad75b2e92ef333179948b52dd5507eadd9f3431e5638d98268d9' \ + && dotnet_sha512='40dbb1cf48f7f27ba95e36b5638ce5529cdba8bbfb03b2ad84e03924067f17ecc1de12132a66bb07f6b432d247bfb80e86cda7f7832d34565b880acc65940321' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ @@ -30,9 +37,9 @@ RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$ && dotnet help # Install PowerShell global tool -RUN powershell_version=7.2.0-preview.3 \ +RUN powershell_version=7.2.0-preview.5 \ && curl -SL --output PowerShell.Linux.arm64.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \ - && powershell_sha512='515a31acd364775e4fc9bec10c10a3f7cc386fdea63e361f54d8019ba35ba358b098130028ad415ce877c9b453d9f2f029fe6f7b505652c597040bba234f46ba' \ + && powershell_sha512='c18386b717567ec7aa52d161713225cd9fa782a77601b4fe829faece49ba3ceed7b8297e8be1dc8f8ac98e2bec1e92bce49c5f191ee90391bbb0c419453021b8' \ && echo "$powershell_sha512 PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \ && mkdir -p /usr/share/powershell \ && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \ diff --git a/src/sdk/6.0/nanoserver-1809/amd64/Dockerfile b/src/sdk/6.0/nanoserver-1809/amd64/Dockerfile index 51063134b8..a8e0ce3b18 100644 --- a/src/sdk/6.0/nanoserver-1809/amd64/Dockerfile +++ b/src/sdk/6.0/nanoserver-1809/amd64/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/aspnet -ARG DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 +ARG DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 # Installer image FROM mcr.microsoft.com/windows/servercore:1809-amd64 AS installer @@ -12,7 +12,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref RUN ` # Retrieve .NET SDK Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/$Env:DOTNET_SDK_VERSION/dotnet-sdk-$Env:DOTNET_SDK_VERSION-win-x64.zip; ` - $dotnet_sha512 = '38fc6d76ef0d2331fcc32319be17edf4887443ad7504131041a12026340f7418227b85aa597d7ecb6c4a57cfd928004c6511455cedc6dcee42284793f66146cf'; ` + $dotnet_sha512 = '0dce469c5b6d4a83555e966556c5b8c12f6598f14a5221c5757f77e874f39834d7342fbb0ec928eb659ab8685b944b6845e17495df4a5a2eca83b9986f716c27'; ` if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -22,9 +22,9 @@ RUN ` Remove-Item -Force dotnet.zip; ` ` # Install PowerShell global tool - $powershell_version = '7.2.0-preview.3'; ` + $powershell_version = '7.2.0-preview.5'; ` Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; ` - $powershell_sha512 = 'edf0073f7bea811b68cc54d0325990a4b28c583c11cac92914f9bd44bf7dead733f5833006d55e19d65d23864e90919826c86f061578889b30521fc5d70fd685'; ` + $powershell_sha512 = '76fec0e3160bb9d19531cb95f7bd1fce07074f990bc2e2e35fe67b00460e034a24079d52aef0353070cecb8261721f1bb314bdd8919f52f788e6c48cadedbecd'; ` if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -46,9 +46,16 @@ ARG DOTNET_SDK_VERSION ENV ` # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= ` + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false ` + # Do not show first run text + DOTNET_NOLOGO=true ` + # SDK version DOTNET_SDK_VERSION=$DOTNET_SDK_VERSION ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage diff --git a/src/sdk/6.0/nanoserver-2004/amd64/Dockerfile b/src/sdk/6.0/nanoserver-2004/amd64/Dockerfile index 5fa3e66555..6327a12545 100644 --- a/src/sdk/6.0/nanoserver-2004/amd64/Dockerfile +++ b/src/sdk/6.0/nanoserver-2004/amd64/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/aspnet -ARG DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 +ARG DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 # Installer image FROM mcr.microsoft.com/windows/servercore:2004-amd64 AS installer @@ -12,7 +12,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref RUN ` # Retrieve .NET SDK Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/$Env:DOTNET_SDK_VERSION/dotnet-sdk-$Env:DOTNET_SDK_VERSION-win-x64.zip; ` - $dotnet_sha512 = '38fc6d76ef0d2331fcc32319be17edf4887443ad7504131041a12026340f7418227b85aa597d7ecb6c4a57cfd928004c6511455cedc6dcee42284793f66146cf'; ` + $dotnet_sha512 = '0dce469c5b6d4a83555e966556c5b8c12f6598f14a5221c5757f77e874f39834d7342fbb0ec928eb659ab8685b944b6845e17495df4a5a2eca83b9986f716c27'; ` if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -22,9 +22,9 @@ RUN ` Remove-Item -Force dotnet.zip; ` ` # Install PowerShell global tool - $powershell_version = '7.2.0-preview.3'; ` + $powershell_version = '7.2.0-preview.5'; ` Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; ` - $powershell_sha512 = 'edf0073f7bea811b68cc54d0325990a4b28c583c11cac92914f9bd44bf7dead733f5833006d55e19d65d23864e90919826c86f061578889b30521fc5d70fd685'; ` + $powershell_sha512 = '76fec0e3160bb9d19531cb95f7bd1fce07074f990bc2e2e35fe67b00460e034a24079d52aef0353070cecb8261721f1bb314bdd8919f52f788e6c48cadedbecd'; ` if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -46,9 +46,16 @@ ARG DOTNET_SDK_VERSION ENV ` # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= ` + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false ` + # Do not show first run text + DOTNET_NOLOGO=true ` + # SDK version DOTNET_SDK_VERSION=$DOTNET_SDK_VERSION ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage diff --git a/src/sdk/6.0/nanoserver-20H2/amd64/Dockerfile b/src/sdk/6.0/nanoserver-20H2/amd64/Dockerfile index 92857473ad..938e0bb122 100644 --- a/src/sdk/6.0/nanoserver-20H2/amd64/Dockerfile +++ b/src/sdk/6.0/nanoserver-20H2/amd64/Dockerfile @@ -1,7 +1,7 @@ # escape=` ARG REPO=mcr.microsoft.com/dotnet/aspnet -ARG DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 +ARG DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 # Installer image FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer @@ -12,7 +12,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref RUN ` # Retrieve .NET SDK Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/$Env:DOTNET_SDK_VERSION/dotnet-sdk-$Env:DOTNET_SDK_VERSION-win-x64.zip; ` - $dotnet_sha512 = '38fc6d76ef0d2331fcc32319be17edf4887443ad7504131041a12026340f7418227b85aa597d7ecb6c4a57cfd928004c6511455cedc6dcee42284793f66146cf'; ` + $dotnet_sha512 = '0dce469c5b6d4a83555e966556c5b8c12f6598f14a5221c5757f77e874f39834d7342fbb0ec928eb659ab8685b944b6845e17495df4a5a2eca83b9986f716c27'; ` if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -22,9 +22,9 @@ RUN ` Remove-Item -Force dotnet.zip; ` ` # Install PowerShell global tool - $powershell_version = '7.2.0-preview.3'; ` + $powershell_version = '7.2.0-preview.5'; ` Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; ` - $powershell_sha512 = 'edf0073f7bea811b68cc54d0325990a4b28c583c11cac92914f9bd44bf7dead733f5833006d55e19d65d23864e90919826c86f061578889b30521fc5d70fd685'; ` + $powershell_sha512 = '76fec0e3160bb9d19531cb95f7bd1fce07074f990bc2e2e35fe67b00460e034a24079d52aef0353070cecb8261721f1bb314bdd8919f52f788e6c48cadedbecd'; ` if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -46,9 +46,16 @@ ARG DOTNET_SDK_VERSION ENV ` # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= ` + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false ` + # Do not show first run text + DOTNET_NOLOGO=true ` + # SDK version DOTNET_SDK_VERSION=$DOTNET_SDK_VERSION ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage diff --git a/src/sdk/6.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/sdk/6.0/windowsservercore-ltsc2019/amd64/Dockerfile index 41160ca3aa..de87786604 100644 --- a/src/sdk/6.0/windowsservercore-ltsc2019/amd64/Dockerfile +++ b/src/sdk/6.0/windowsservercore-ltsc2019/amd64/Dockerfile @@ -6,9 +6,16 @@ FROM $REPO:6.0-windowsservercore-ltsc2019 ENV ` # Unset ASPNETCORE_URLS from aspnet base image ASPNETCORE_URLS= ` - DOTNET_SDK_VERSION=6.0.100-preview.3.21202.5 ` + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false ` + # Do not show first run text + DOTNET_NOLOGO=true ` + # SDK version + DOTNET_SDK_VERSION=6.0.100-preview.4.21255.9 ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` + # Unset Logging__Console__FormatterName from aspnet base image + Logging__Console__FormatterName= ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage @@ -20,7 +27,7 @@ RUN powershell -Command "` ` # Retrieve .NET SDK Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/$Env:DOTNET_SDK_VERSION/dotnet-sdk-$Env:DOTNET_SDK_VERSION-win-x64.zip; ` - $dotnet_sha512 = '38fc6d76ef0d2331fcc32319be17edf4887443ad7504131041a12026340f7418227b85aa597d7ecb6c4a57cfd928004c6511455cedc6dcee42284793f66146cf'; ` + $dotnet_sha512 = '0dce469c5b6d4a83555e966556c5b8c12f6598f14a5221c5757f77e874f39834d7342fbb0ec928eb659ab8685b944b6845e17495df4a5a2eca83b9986f716c27'; ` if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` @@ -29,9 +36,9 @@ RUN powershell -Command "` Remove-Item -Force dotnet.zip; ` ` # Install PowerShell global tool - $powershell_version = '7.2.0-preview.3'; ` + $powershell_version = '7.2.0-preview.5'; ` Invoke-WebRequest -OutFile PowerShell.Windows.x64.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Windows.x64.$powershell_version.nupkg; ` - $powershell_sha512 = 'edf0073f7bea811b68cc54d0325990a4b28c583c11cac92914f9bd44bf7dead733f5833006d55e19d65d23864e90919826c86f061578889b30521fc5d70fd685'; ` + $powershell_sha512 = '76fec0e3160bb9d19531cb95f7bd1fce07074f990bc2e2e35fe67b00460e034a24079d52aef0353070cecb8261721f1bb314bdd8919f52f788e6c48cadedbecd'; ` if ((Get-FileHash PowerShell.Windows.x64.$powershell_version.nupkg -Algorithm sha512).Hash -ne $powershell_sha512) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs index 94ca06634c..3c62427ba9 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs @@ -23,8 +23,8 @@ public AspnetImageTests(ITestOutputHelper outputHelper) [MemberData(nameof(GetImageData))] public async Task VerifyAppScenario(ProductImageData imageData) { - // Skip test for Arm32 Alpine 3.13 due to https://github.com/dotnet/runtime/issues/47423 - if (imageData.OS == "alpine3.13" && imageData.Arch == Arch.Arm) + // Skip test for .NET 5 on Arm32 Alpine 3.13 due to https://github.com/dotnet/runtime/issues/47423 + if (imageData.Version.Major == 5 && imageData.OS == "alpine3.13" && imageData.Arch == Arch.Arm) { return; } @@ -50,6 +50,11 @@ public void VerifyEnvironmentVariables(ProductImageData imageData) variables.Add(RuntimeImageTests.GetRuntimeVersionVariableInfo(imageData, DockerHelper)); } + if (imageData.Version.Major >= 6) + { + variables.Add(new EnvironmentVariableInfo("Logging__Console__FormatterName", "Json")); + } + base.VerifyCommonEnvironmentVariables(imageData, variables); } diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageScenarioVerifier.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageScenarioVerifier.cs index 886ce1a84a..ae2e50d9cd 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ImageScenarioVerifier.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ImageScenarioVerifier.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; using System.Net.Http; +using System.Text; using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; @@ -61,7 +62,7 @@ public async Task Execute() if (DockerHelper.IsLinuxContainerModeEnabled) { // Skip test until end-to-end scenario works for self-contained publishing on Alpine arm32 - if ((_imageData.Version.Major == 5 || _imageData.Version.Major == 6) && + if ((_imageData.Version.Major == 5) && _imageData.Arch == Arch.Arm && _imageData.OS.Contains("alpine")) { return; @@ -85,21 +86,54 @@ private static void InjectCustomTestCode(string appDir) string programFilePath = Path.Combine(appDir, "Program.cs"); SyntaxTree programTree = CSharpSyntaxTree.ParseText(File.ReadAllText(programFilePath)); + + string newContent; + MethodDeclarationSyntax mainMethod = programTree.GetRoot().DescendantNodes() .OfType() .FirstOrDefault(method => method.Identifier.ValueText == "Main"); - StatementSyntax testHttpsConnectivityStatement = SyntaxFactory.ParseStatement( - "var task = new System.Net.Http.HttpClient().GetAsync(\"https://www.microsoft.com\");" + - "task.Wait();" + - "task.Result.EnsureSuccessStatusCode();"); + if (mainMethod is null) + { + // Handles project templates that use top-level statements instead of a Main method + IEnumerable nodes = programTree.GetRoot().ChildNodes(); + + IEnumerable usingDirectives = nodes.OfType(); + + IEnumerable otherNodes = nodes.Except(usingDirectives); + + StringBuilder builder = new(); + foreach (UsingDirectiveSyntax usingDir in usingDirectives) + { + builder.Append(usingDir.ToFullString()); + } + + builder.AppendLine("var response = await new System.Net.Http.HttpClient().GetAsync(\"https://www.microsoft.com\");"); + builder.AppendLine("response.EnsureSuccessStatusCode();"); + + foreach (SyntaxNode otherNode in otherNodes) + { + builder.Append(otherNode.ToFullString()); + } + + newContent = builder.ToString(); + } + else + { + StatementSyntax testHttpsConnectivityStatement = SyntaxFactory.ParseStatement( + "var task = new System.Net.Http.HttpClient().GetAsync(\"https://www.microsoft.com\");" + + "task.Wait();" + + "task.Result.EnsureSuccessStatusCode();"); - MethodDeclarationSyntax newMainMethod = mainMethod.InsertNodesBefore( - mainMethod.Body.ChildNodes().First(), - new SyntaxNode[] { testHttpsConnectivityStatement }); + MethodDeclarationSyntax newMainMethod = mainMethod.InsertNodesBefore( + mainMethod.Body.ChildNodes().First(), + new SyntaxNode[] { testHttpsConnectivityStatement }); - SyntaxNode newRoot = programTree.GetRoot().ReplaceNode(mainMethod, newMainMethod); - File.WriteAllText(programFilePath, newRoot.ToFullString()); + SyntaxNode newRoot = programTree.GetRoot().ReplaceNode(mainMethod, newMainMethod); + newContent = newRoot.ToFullString(); + } + + File.WriteAllText(programFilePath, newContent); } private string BuildTestAppImage(string stageTarget, string contextDir, params string[] customBuildArgs) diff --git a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs index 49b85b1b17..e51d0b75fd 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs @@ -23,8 +23,8 @@ public RuntimeImageTests(ITestOutputHelper outputHelper) [MemberData(nameof(GetImageData))] public async Task VerifyAppScenario(ProductImageData imageData) { - // Skip test for Arm32 Alpine 3.13 due to https://github.com/dotnet/runtime/issues/47423 - if (imageData.OS == "alpine3.13" && imageData.Arch == Arch.Arm) + // Skip test for .NET 5 on Arm32 Alpine 3.13 due to https://github.com/dotnet/runtime/issues/47423 + if (imageData.Version.Major == 5 && imageData.OS == "alpine3.13" && imageData.Arch == Arch.Arm) { return; } diff --git a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs index 09ac1bea36..d6110bcc05 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs @@ -49,13 +49,14 @@ public void VerifyInsecureFiles(ProductImageData imageData) [MemberData(nameof(GetImageData))] public void VerifyEnvironmentVariables(ProductImageData imageData) { - List variables = new List(); - variables.AddRange(GetCommonEnvironmentVariables()); - string aspnetUrlsValue = imageData.Version.Major < 3 ? "http://+:80" : string.Empty; - variables.Add(new EnvironmentVariableInfo("ASPNETCORE_URLS", aspnetUrlsValue)); - variables.Add(new EnvironmentVariableInfo("DOTNET_USE_POLLING_FILE_WATCHER", "true")); - variables.Add(new EnvironmentVariableInfo("NUGET_XMLDOC_MODE", "skip")); + List variables = new() + { + new EnvironmentVariableInfo("ASPNETCORE_URLS", aspnetUrlsValue), + new EnvironmentVariableInfo("DOTNET_USE_POLLING_FILE_WATCHER", "true"), + new EnvironmentVariableInfo("NUGET_XMLDOC_MODE", "skip") + }; + variables.AddRange(GetCommonEnvironmentVariables()); if (imageData.Version.Major >= 3) { @@ -74,6 +75,13 @@ public void VerifyEnvironmentVariables(ProductImageData imageData) variables.Add(RuntimeImageTests.GetRuntimeVersionVariableInfo(imageData, DockerHelper)); } + if (imageData.Version.Major >= 6) + { + variables.Add(new EnvironmentVariableInfo("DOTNET_GENERATE_ASPNET_CERTIFICATE", "false")); + variables.Add(new EnvironmentVariableInfo("DOTNET_NOLOGO", "true")); + variables.Add(new EnvironmentVariableInfo("Logging__Console__FormatterName", string.Empty)); + } + if (imageData.SdkOS.StartsWith(OS.AlpinePrefix)) { variables.Add(new EnvironmentVariableInfo("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "false")); @@ -147,12 +155,6 @@ public void VerifyPowerShellScenario_NonDefaultUser(ProductImageData imageData) [MemberData(nameof(GetImageData))] public async Task VerifyDotnetFolderContents(ProductImageData imageData) { - // Disable this test for 5.0 due to https://github.com/dotnet/aspnetcore/issues/27670 - if (imageData.Version.Major == 5) - { - return; - } - // Disable this test for Arm-based Alpine on 6.0 until PowerShell has support (https://github.com/PowerShell/PowerShell/issues/14667, https://github.com/PowerShell/PowerShell/issues/12937) if (imageData.Version.Major == 6 && imageData.OS.Contains("alpine") && imageData.IsArm) { @@ -173,17 +175,13 @@ public async Task VerifyDotnetFolderContents(ProductImageData imageData) bool hasFileContentDifference = false; - // Skip file comparisons for 3.1 until https://github.com/dotnet/sdk/issues/11327 is fixed. - if (imageData.Version.Major != 3) + int fileCount = expectedDotnetFiles.Count(); + for (int i = 0; i < fileCount; i++) { - int fileCount = expectedDotnetFiles.Count(); - for (int i = 0; i < fileCount; i++) + if (expectedDotnetFiles.ElementAt(i).CompareTo(actualDotnetFiles.ElementAt(i)) != 0) { - if (expectedDotnetFiles.ElementAt(i).CompareTo(actualDotnetFiles.ElementAt(i)) != 0) - { - hasFileContentDifference = true; - break; - } + hasFileContentDifference = true; + break; } } diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index d7481f7c8c..6b96dffccc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -52,6 +52,7 @@ public static class TestData new ProductImageData { Version = V6_0, OS = OS.BullseyeSlim, Arch = Arch.Arm64 }, new ProductImageData { Version = V6_0, OS = OS.Focal, Arch = Arch.Arm }, new ProductImageData { Version = V6_0, OS = OS.Focal, Arch = Arch.Arm64 }, + new ProductImageData { Version = V6_0, OS = OS.Alpine313, Arch = Arch.Arm }, new ProductImageData { Version = V6_0, OS = OS.Alpine313, Arch = Arch.Arm64 }, }; private static readonly ProductImageData[] s_windowsTestData = diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json index 3d7a0e78ad..dd7f693e4c 100644 --- a/tests/performance/ImageSize.nightly.linux.json +++ b/tests/performance/ImageSize.nightly.linux.json @@ -143,12 +143,12 @@ "src/sdk/5.0/focal/amd64": 615235315, "src/sdk/5.0/focal/arm32v7": 564440607, "src/sdk/5.0/focal/arm64v8": 637793431, - "src/sdk/6.0/bullseye-slim/amd64": 640031360, - "src/sdk/6.0/bullseye-slim/arm32v7": 585340315, - "src/sdk/6.0/bullseye-slim/arm64v8": 660030347, - "src/sdk/6.0/alpine3.13/amd64": 502952917, - "src/sdk/6.0/alpine3.13/arm32v7": 448150836, - "src/sdk/6.0/alpine3.13/arm64v8": 494767769, + "src/sdk/6.0/bullseye-slim/amd64": 674991599, + "src/sdk/6.0/bullseye-slim/arm32v7": 619204906, + "src/sdk/6.0/bullseye-slim/arm64v8": 694614928, + "src/sdk/6.0/alpine3.13/amd64": 530126770, + "src/sdk/6.0/alpine3.13/arm32v7": 475126787, + "src/sdk/6.0/alpine3.13/arm64v8": 521464732, "src/sdk/6.0/focal/amd64": 652648922, "src/sdk/6.0/focal/arm32v7": 591681171, "src/sdk/6.0/focal/arm64v8": 669929244 diff --git a/tests/performance/ImageSize.nightly.windows.json b/tests/performance/ImageSize.nightly.windows.json index 72409c6f5a..2593e6729d 100644 --- a/tests/performance/ImageSize.nightly.windows.json +++ b/tests/performance/ImageSize.nightly.windows.json @@ -9,11 +9,11 @@ "src/runtime/5.0/nanoserver-1809/amd64": 321408734, "src/runtime/5.0/nanoserver-2004/amd64": 332279013, "src/runtime/5.0/nanoserver-20H2/amd64": 331997328, - "src/runtime/5.0/windowsservercore-ltsc2019/amd64": 5179432868, + "src/runtime/5.0/windowsservercore-ltsc2019/amd64": 6185697083, "src/runtime/6.0/nanoserver-1809/amd64": 320203081, "src/runtime/6.0/nanoserver-2004/amd64": 331433285, "src/runtime/6.0/nanoserver-20H2/amd64": 331505218, - "src/runtime/6.0/windowsservercore-ltsc2019/amd64": 5248061811 + "src/runtime/6.0/windowsservercore-ltsc2019/amd64": 6149400637 }, "dotnet/nightly/aspnet": { "src/aspnet/2.1/nanoserver-1809/amd64": 387919601, @@ -25,11 +25,11 @@ "src/aspnet/5.0/nanoserver-1809/amd64": 341072949, "src/aspnet/5.0/nanoserver-2004/amd64": 352472752, "src/aspnet/5.0/nanoserver-20H2/amd64": 352935076, - "src/aspnet/5.0/windowsservercore-ltsc2019/amd64": 5230505064, + "src/aspnet/5.0/windowsservercore-ltsc2019/amd64": 6212835469, "src/aspnet/6.0/nanoserver-1809/amd64": 340839229, "src/aspnet/6.0/nanoserver-2004/amd64": 352069433, "src/aspnet/6.0/nanoserver-20H2/amd64": 352141366, - "src/aspnet/6.0/windowsservercore-ltsc2019/amd64": 5298604791 + "src/aspnet/6.0/windowsservercore-ltsc2019/amd64": 6174324854 }, "dotnet/nightly/sdk": { "src/sdk/2.1/nanoserver-1809/amd64": 1651068899, @@ -41,10 +41,10 @@ "src/sdk/5.0/nanoserver-1809/amd64": 831969504, "src/sdk/5.0/nanoserver-2004/amd64": 820353958, "src/sdk/5.0/nanoserver-20H2/amd64": 832507988, - "src/sdk/5.0/windowsservercore-ltsc2019/amd64": 5746263526, + "src/sdk/5.0/windowsservercore-ltsc2019/amd64": 6717028601, "src/sdk/6.0/nanoserver-1809/amd64": 910773895, "src/sdk/6.0/nanoserver-2004/amd64": 922322813, "src/sdk/6.0/nanoserver-20H2/amd64": 922312433, - "src/sdk/6.0/windowsservercore-ltsc2019/amd64": 5844379409 + "src/sdk/6.0/windowsservercore-ltsc2019/amd64": 6750998416 } }