Refactor Dockerfile directories to align with tags (#1999) (#2008)

* Refactor Dockerfile directories to align with tags (#1999)

* Add src directory for all product Dockerfiles (#2009)

.github/ISSUE_TEMPLATE/releases/net-core-release.md

@@ -31,11 +31,11 @@ _The set of .NET Core versions that are being released as a unit._
 
       Servicing release:
 
-          imageBuilder.pathArgs: --path '2.1*' --path '3.1*'
+          imageBuilder.pathArgs: --path 'src/*/2.1/*' --path 'src/*/3.1/*'
 
       Preview release:
 
-          imageBuilder.pathArgs: --path '5.0*'
+          imageBuilder.pathArgs: --path 'src/*/5.0/*'
 1. - [ ] Wait for NuGet packages to be published during release tic-toc
 1. - [ ] Test and publish images - Queue build of [dotnet-docker pipeline](https://dev.azure.com/dnceng/internal/_build?definitionId=373) (internal MSFT link) with variables:
 
@@ -46,11 +46,11 @@ _The set of .NET Core versions that are being released as a unit._
 
       Servicing release:
 
-          imageBuilder.pathArgs: --path '2.1*' --path '3.1*'
+          imageBuilder.pathArgs: --path 'src/*/2.1/*' --path 'src/*/3.1/*'
 
       Preview release:
 
-          imageBuilder.pathArgs: --path '5.0*'
+          imageBuilder.pathArgs: --path 'src/*/5.0/*'
 1. - [ ] Confirm images have been ingested by MCR
 1. - [ ] Confirm READMEs have been updated in [Docker Hub](https://hub.docker.com/_/microsoft-dotnet-core)
 

README.aspnet.md

@@ -59,57 +59,57 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn
 ## Linux amd64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim, 3.1-buster-slim, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/buster-slim/amd64/Dockerfile) | Debian 10
-3.1.5-alpine3.12, 3.1-alpine3.12, 3.1.5-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-3.1.5-alpine3.11, 3.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-3.1.5-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/focal/amd64/Dockerfile) | Ubuntu 20.04
-3.1.5-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/bionic/amd64/Dockerfile) | Ubuntu 18.04
-2.1.19-stretch-slim, 2.1-stretch-slim, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/stretch-slim/amd64/Dockerfile) | Debian 9
-2.1.19-alpine3.12, 2.1-alpine3.12, 2.1.19-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-2.1.19-alpine3.11, 2.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-2.1.19-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/focal/amd64/Dockerfile) | Ubuntu 20.04
-2.1.19-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/bionic/amd64/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim, 3.1-buster-slim, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/buster-slim/amd64/Dockerfile) | Debian 10
+3.1.5-alpine3.12, 3.1-alpine3.12, 3.1.5-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+3.1.5-alpine3.11, 3.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+3.1.5-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/focal/amd64/Dockerfile) | Ubuntu 20.04
+3.1.5-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/bionic/amd64/Dockerfile) | Ubuntu 18.04
+2.1.19-stretch-slim, 2.1-stretch-slim, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/stretch-slim/amd64/Dockerfile) | Debian 9
+2.1.19-alpine3.12, 2.1-alpine3.12, 2.1.19-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+2.1.19-alpine3.11, 2.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+2.1.19-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/focal/amd64/Dockerfile) | Ubuntu 20.04
+2.1.19-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/bionic/amd64/Dockerfile) | Ubuntu 18.04
 
 ## Linux arm64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/buster-slim/arm64v8/Dockerfile) | Debian 10
-3.1.5-alpine3.12-arm64v8, 3.1-alpine3.12-arm64v8, 3.1.5-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
-3.1.5-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
-3.1.5-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/focal/arm64v8/Dockerfile) | Ubuntu 20.04
-3.1.5-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/bionic/arm64v8/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/buster-slim/arm64v8/Dockerfile) | Debian 10
+3.1.5-alpine3.12-arm64v8, 3.1-alpine3.12-arm64v8, 3.1.5-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
+3.1.5-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
+3.1.5-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+3.1.5-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/bionic/arm64v8/Dockerfile) | Ubuntu 18.04
 
 ## Linux arm32 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim-arm32v7, 3.1-buster-slim-arm32v7, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/buster-slim/arm32v7/Dockerfile) | Debian 10
-3.1.5-bionic-arm32v7, 3.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
-2.1.19-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/stretch-slim/arm32v7/Dockerfile) | Debian 9
-2.1.19-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim-arm32v7, 3.1-buster-slim-arm32v7, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/buster-slim/arm32v7/Dockerfile) | Debian 10
+3.1.5-bionic-arm32v7, 3.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
+2.1.19-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/stretch-slim/arm32v7/Dockerfile) | Debian 9
+2.1.19-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
 ## Windows Server, version 2004 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.5-nanoserver-2004, 3.1-nanoserver-2004, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-2004/amd64/Dockerfile)
-2.1.19-nanoserver-2004, 2.1-nanoserver-2004, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-2004/amd64/Dockerfile)
+3.1.5-nanoserver-2004, 3.1-nanoserver-2004, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-2004/amd64/Dockerfile)
+2.1.19-nanoserver-2004, 2.1-nanoserver-2004, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-2004/amd64/Dockerfile)
 
 ## Windows Server, version 1909 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.5-nanoserver-1909, 3.1-nanoserver-1909, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1909/amd64/Dockerfile)
-2.1.19-nanoserver-1909, 2.1-nanoserver-1909, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1909/amd64/Dockerfile)
+3.1.5-nanoserver-1909, 3.1-nanoserver-1909, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-1909/amd64/Dockerfile)
+2.1.19-nanoserver-1909, 2.1-nanoserver-1909, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-1909/amd64/Dockerfile)
 
 ## Windows Server, version 1903 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.5-nanoserver-1903, 3.1-nanoserver-1903, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1903/amd64/Dockerfile)
-2.1.19-nanoserver-1903, 2.1-nanoserver-1903, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1903/amd64/Dockerfile)
+3.1.5-nanoserver-1903, 3.1-nanoserver-1903, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-1903/amd64/Dockerfile)
+2.1.19-nanoserver-1903, 2.1-nanoserver-1903, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-1903/amd64/Dockerfile)
 
 ## Windows Server 2019 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.5-nanoserver-1809, 3.1-nanoserver-1809, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1809/amd64/Dockerfile)
-2.1.19-nanoserver-1809, 2.1-nanoserver-1809, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1809/amd64/Dockerfile)
+3.1.5-nanoserver-1809, 3.1-nanoserver-1809, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-1809/amd64/Dockerfile)
+2.1.19-nanoserver-1809, 2.1-nanoserver-1809, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-1809/amd64/Dockerfile)
 
 You can retrieve a list of all available tags for dotnet/core/aspnet at https://mcr.microsoft.com/v2/dotnet/core/aspnet/tags/list.
 

README.aspnet.preview.md

@@ -61,49 +61,49 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim, 5.0-buster-slim, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/amd64/Dockerfile) | Debian 10
-5.0.0-preview.5-alpine3.12, 5.0-alpine3.12, 5.0.0-preview.5-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-5.0.0-preview.5-alpine3.11, 5.0-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-5.0.0-preview.5-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/focal/amd64/Dockerfile) | Ubuntu 20.04
+5.0.0-preview.5-buster-slim, 5.0-buster-slim, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/buster-slim/amd64/Dockerfile) | Debian 10
+5.0.0-preview.5-alpine3.12, 5.0-alpine3.12, 5.0.0-preview.5-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+5.0.0-preview.5-alpine3.11, 5.0-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+5.0.0-preview.5-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/focal/amd64/Dockerfile) | Ubuntu 20.04
 
 ## Linux arm64 Tags
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/arm64v8/Dockerfile) | Debian 10
-5.0.0-preview.5-alpine3.12-arm64v8, 5.0-alpine3.12-arm64v8, 5.0.0-preview.5-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
-5.0.0-preview.5-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
-5.0.0-preview.5-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+5.0.0-preview.5-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/buster-slim/arm64v8/Dockerfile) | Debian 10
+5.0.0-preview.5-alpine3.12-arm64v8, 5.0-alpine3.12-arm64v8, 5.0.0-preview.5-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
+5.0.0-preview.5-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
+5.0.0-preview.5-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04
 
 ## Linux arm32 Tags
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/arm32v7/Dockerfile) | Debian 10
+5.0.0-preview.5-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/buster-slim/arm32v7/Dockerfile) | Debian 10
 
 ## Windows Server, version 2004 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-preview.5-nanoserver-2004, 5.0-nanoserver-2004, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-2004/amd64/Dockerfile)
+5.0.0-preview.5-nanoserver-2004, 5.0-nanoserver-2004, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-2004/amd64/Dockerfile)
 
 ## Windows Server, version 1909 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-preview.5-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1909/amd64/Dockerfile)
+5.0.0-preview.5-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-1909/amd64/Dockerfile)
 
 ## Windows Server, version 1903 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-preview.5-nanoserver-1903, 5.0-nanoserver-1903, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1903/amd64/Dockerfile)
+5.0.0-preview.5-nanoserver-1903, 5.0-nanoserver-1903, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-1903/amd64/Dockerfile)
 
 ## Windows Server 2019 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-preview.5-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1809/amd64/Dockerfile)
+5.0.0-preview.5-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-1809/amd64/Dockerfile)
 
 You can retrieve a list of all available tags for dotnet/aspnet at https://mcr.microsoft.com/v2/dotnet/aspnet/tags/list.
 

README.runtime-deps.md

@@ -47,33 +47,33 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast
 ## Linux amd64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim, 3.1-buster-slim, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/buster-slim/amd64/Dockerfile) | Debian 10
-3.1.5-alpine3.12, 3.1-alpine3.12, 3.1.5-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-3.1.5-alpine3.11, 3.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-3.1.5-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/focal/amd64/Dockerfile) | Ubuntu 20.04
-3.1.5-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/bionic/amd64/Dockerfile) | Ubuntu 18.04
-2.1.19-stretch-slim, 2.1-stretch-slim, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/stretch-slim/amd64/Dockerfile) | Debian 9
-2.1.19-alpine3.12, 2.1-alpine3.12, 2.1.19-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-2.1.19-alpine3.11, 2.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-2.1.19-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/focal/amd64/Dockerfile) | Ubuntu 20.04
-2.1.19-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/amd64/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim, 3.1-buster-slim, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/buster-slim/amd64/Dockerfile) | Debian 10
+3.1.5-alpine3.12, 3.1-alpine3.12, 3.1.5-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+3.1.5-alpine3.11, 3.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+3.1.5-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/focal/amd64/Dockerfile) | Ubuntu 20.04
+3.1.5-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/bionic/amd64/Dockerfile) | Ubuntu 18.04
+2.1.19-stretch-slim, 2.1-stretch-slim, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/2.1/stretch-slim/amd64/Dockerfile) | Debian 9
+2.1.19-alpine3.12, 2.1-alpine3.12, 2.1.19-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/2.1/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+2.1.19-alpine3.11, 2.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/2.1/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+2.1.19-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/2.1/focal/amd64/Dockerfile) | Ubuntu 20.04
+2.1.19-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/2.1/bionic/amd64/Dockerfile) | Ubuntu 18.04
 
 ## Linux arm64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/buster-slim/arm64v8/Dockerfile) | Debian 10
-3.1.5-alpine3.12-arm64v8, 3.1-alpine3.12-arm64v8, 3.1.5-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
-3.1.5-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
-3.1.5-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/focal/arm64v8/Dockerfile) | Ubuntu 20.04
-3.1.5-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/bionic/arm64v8/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/buster-slim/arm64v8/Dockerfile) | Debian 10
+3.1.5-alpine3.12-arm64v8, 3.1-alpine3.12-arm64v8, 3.1.5-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
+3.1.5-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
+3.1.5-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+3.1.5-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/bionic/arm64v8/Dockerfile) | Ubuntu 18.04
 
 ## Linux arm32 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim-arm32v7, 3.1-buster-slim-arm32v7, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/buster-slim/arm32v7/Dockerfile) | Debian 10
-3.1.5-bionic-arm32v7, 3.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
-2.1.19-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/stretch-slim/arm32v7/Dockerfile) | Debian 9
-2.1.19-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim-arm32v7, 3.1-buster-slim-arm32v7, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/buster-slim/arm32v7/Dockerfile) | Debian 10
+3.1.5-bionic-arm32v7, 3.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/3.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
+2.1.19-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/2.1/stretch-slim/arm32v7/Dockerfile) | Debian 9
+2.1.19-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
 You can retrieve a list of all available tags for dotnet/core/runtime-deps at https://mcr.microsoft.com/v2/dotnet/core/runtime-deps/tags/list.
 

README.runtime-deps.preview.md

@@ -49,25 +49,25 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/sa
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim, 5.0-buster-slim, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/amd64/Dockerfile) | Debian 10
-5.0.0-preview.5-alpine3.12, 5.0-alpine3.12, 5.0.0-preview.5-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-5.0.0-preview.5-alpine3.11, 5.0-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-5.0.0-preview.5-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/focal/amd64/Dockerfile) | Ubuntu 20.04
+5.0.0-preview.5-buster-slim, 5.0-buster-slim, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/buster-slim/amd64/Dockerfile) | Debian 10
+5.0.0-preview.5-alpine3.12, 5.0-alpine3.12, 5.0.0-preview.5-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+5.0.0-preview.5-alpine3.11, 5.0-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+5.0.0-preview.5-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/focal/amd64/Dockerfile) | Ubuntu 20.04
 
 ## Linux arm64 Tags
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/arm64v8/Dockerfile) | Debian 10
-5.0.0-preview.5-alpine3.12-arm64v8, 5.0-alpine3.12-arm64v8, 5.0.0-preview.5-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
-5.0.0-preview.5-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
-5.0.0-preview.5-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+5.0.0-preview.5-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/buster-slim/arm64v8/Dockerfile) | Debian 10
+5.0.0-preview.5-alpine3.12-arm64v8, 5.0-alpine3.12-arm64v8, 5.0.0-preview.5-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
+5.0.0-preview.5-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
+5.0.0-preview.5-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04
 
 ## Linux arm32 Tags
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/arm32v7/Dockerfile) | Debian 10
+5.0.0-preview.5-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime-deps/5.0/buster-slim/arm32v7/Dockerfile) | Debian 10
 
 You can retrieve a list of all available tags for dotnet/runtime-deps at https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list.
 

README.runtime.md

@@ -55,57 +55,57 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples
 ## Linux amd64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim, 3.1-buster-slim, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/buster-slim/amd64/Dockerfile) | Debian 10
-3.1.5-alpine3.12, 3.1-alpine3.12, 3.1.5-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-3.1.5-alpine3.11, 3.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-3.1.5-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/focal/amd64/Dockerfile) | Ubuntu 20.04
-3.1.5-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/bionic/amd64/Dockerfile) | Ubuntu 18.04
-2.1.19-stretch-slim, 2.1-stretch-slim, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/stretch-slim/amd64/Dockerfile) | Debian 9
-2.1.19-alpine3.12, 2.1-alpine3.12, 2.1.19-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-2.1.19-alpine3.11, 2.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-2.1.19-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/focal/amd64/Dockerfile) | Ubuntu 20.04
-2.1.19-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/bionic/amd64/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim, 3.1-buster-slim, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/buster-slim/amd64/Dockerfile) | Debian 10
+3.1.5-alpine3.12, 3.1-alpine3.12, 3.1.5-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+3.1.5-alpine3.11, 3.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+3.1.5-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/focal/amd64/Dockerfile) | Ubuntu 20.04
+3.1.5-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/bionic/amd64/Dockerfile) | Ubuntu 18.04
+2.1.19-stretch-slim, 2.1-stretch-slim, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/stretch-slim/amd64/Dockerfile) | Debian 9
+2.1.19-alpine3.12, 2.1-alpine3.12, 2.1.19-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+2.1.19-alpine3.11, 2.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+2.1.19-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/focal/amd64/Dockerfile) | Ubuntu 20.04
+2.1.19-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/bionic/amd64/Dockerfile) | Ubuntu 18.04
 
 ## Linux arm64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/buster-slim/arm64v8/Dockerfile) | Debian 10
-3.1.5-alpine3.12-arm64v8, 3.1-alpine3.12-arm64v8, 3.1.5-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
-3.1.5-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
-3.1.5-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/focal/arm64v8/Dockerfile) | Ubuntu 20.04
-3.1.5-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/bionic/arm64v8/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/buster-slim/arm64v8/Dockerfile) | Debian 10
+3.1.5-alpine3.12-arm64v8, 3.1-alpine3.12-arm64v8, 3.1.5-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
+3.1.5-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
+3.1.5-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+3.1.5-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/bionic/arm64v8/Dockerfile) | Ubuntu 18.04
 
 ## Linux arm32 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.5-buster-slim-arm32v7, 3.1-buster-slim-arm32v7, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/buster-slim/arm32v7/Dockerfile) | Debian 10
-3.1.5-bionic-arm32v7, 3.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
-2.1.19-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/stretch-slim/arm32v7/Dockerfile) | Debian 9
-2.1.19-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
+3.1.5-buster-slim-arm32v7, 3.1-buster-slim-arm32v7, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/buster-slim/arm32v7/Dockerfile) | Debian 10
+3.1.5-bionic-arm32v7, 3.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
+2.1.19-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/stretch-slim/arm32v7/Dockerfile) | Debian 9
+2.1.19-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
 ## Windows Server, version 2004 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.5-nanoserver-2004, 3.1-nanoserver-2004, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-2004/amd64/Dockerfile)
-2.1.19-nanoserver-2004, 2.1-nanoserver-2004, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-2004/amd64/Dockerfile)
+3.1.5-nanoserver-2004, 3.1-nanoserver-2004, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-2004/amd64/Dockerfile)
+2.1.19-nanoserver-2004, 2.1-nanoserver-2004, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-2004/amd64/Dockerfile)
 
 ## Windows Server, version 1909 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.5-nanoserver-1909, 3.1-nanoserver-1909, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1909/amd64/Dockerfile)
-2.1.19-nanoserver-1909, 2.1-nanoserver-1909, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1909/amd64/Dockerfile)
+3.1.5-nanoserver-1909, 3.1-nanoserver-1909, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-1909/amd64/Dockerfile)
+2.1.19-nanoserver-1909, 2.1-nanoserver-1909, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-1909/amd64/Dockerfile)
 
 ## Windows Server, version 1903 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.5-nanoserver-1903, 3.1-nanoserver-1903, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1903/amd64/Dockerfile)
-2.1.19-nanoserver-1903, 2.1-nanoserver-1903, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1903/amd64/Dockerfile)
+3.1.5-nanoserver-1903, 3.1-nanoserver-1903, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-1903/amd64/Dockerfile)
+2.1.19-nanoserver-1903, 2.1-nanoserver-1903, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-1903/amd64/Dockerfile)
 
 ## Windows Server 2019 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.5-nanoserver-1809, 3.1-nanoserver-1809, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1809/amd64/Dockerfile)
-2.1.19-nanoserver-1809, 2.1-nanoserver-1809, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1809/amd64/Dockerfile)
+3.1.5-nanoserver-1809, 3.1-nanoserver-1809, 3.1.5, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-1809/amd64/Dockerfile)
+2.1.19-nanoserver-1809, 2.1-nanoserver-1809, 2.1.19, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-1809/amd64/Dockerfile)
 
 You can retrieve a list of all available tags for dotnet/core/runtime at https://mcr.microsoft.com/v2/dotnet/core/runtime/tags/list.
 

README.runtime.preview.md

@@ -57,49 +57,49 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim, 5.0-buster-slim, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/amd64/Dockerfile) | Debian 10
-5.0.0-preview.5-alpine3.12, 5.0-alpine3.12, 5.0.0-preview.5-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-5.0.0-preview.5-alpine3.11, 5.0-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-5.0.0-preview.5-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/focal/amd64/Dockerfile) | Ubuntu 20.04
+5.0.0-preview.5-buster-slim, 5.0-buster-slim, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/buster-slim/amd64/Dockerfile) | Debian 10
+5.0.0-preview.5-alpine3.12, 5.0-alpine3.12, 5.0.0-preview.5-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+5.0.0-preview.5-alpine3.11, 5.0-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+5.0.0-preview.5-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/focal/amd64/Dockerfile) | Ubuntu 20.04
 
 ## Linux arm64 Tags
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/arm64v8/Dockerfile) | Debian 10
-5.0.0-preview.5-alpine3.12-arm64v8, 5.0-alpine3.12-arm64v8, 5.0.0-preview.5-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
-5.0.0-preview.5-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
-5.0.0-preview.5-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+5.0.0-preview.5-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/buster-slim/arm64v8/Dockerfile) | Debian 10
+5.0.0-preview.5-alpine3.12-arm64v8, 5.0-alpine3.12-arm64v8, 5.0.0-preview.5-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/alpine3.12/arm64v8/Dockerfile) | Alpine 3.12
+5.0.0-preview.5-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11
+5.0.0-preview.5-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04
 
 ## Linux arm32 Tags
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.0-preview.5-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/arm32v7/Dockerfile) | Debian 10
+5.0.0-preview.5-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/buster-slim/arm32v7/Dockerfile) | Debian 10
 
 ## Windows Server, version 2004 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-preview.5-nanoserver-2004, 5.0-nanoserver-2004, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-2004/amd64/Dockerfile)
+5.0.0-preview.5-nanoserver-2004, 5.0-nanoserver-2004, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-2004/amd64/Dockerfile)
 
 ## Windows Server, version 1909 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-preview.5-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1909/amd64/Dockerfile)
+5.0.0-preview.5-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-1909/amd64/Dockerfile)
 
 ## Windows Server, version 1903 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-preview.5-nanoserver-1903, 5.0-nanoserver-1903, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1903/amd64/Dockerfile)
+5.0.0-preview.5-nanoserver-1903, 5.0-nanoserver-1903, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-1903/amd64/Dockerfile)
 
 ## Windows Server 2019 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-preview.5-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1809/amd64/Dockerfile)
+5.0.0-preview.5-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-1809/amd64/Dockerfile)
 
 You can retrieve a list of all available tags for dotnet/runtime at https://mcr.microsoft.com/v2/dotnet/runtime/tags/list.
 

README.sdk.md

@@ -59,55 +59,55 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast
 ## Linux amd64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.301-buster, 3.1-buster, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/buster/amd64/Dockerfile) | Debian 10
-3.1.301-alpine3.12, 3.1-alpine3.12, 3.1.301-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-3.1.301-alpine3.11, 3.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-3.1.301-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/focal/amd64/Dockerfile) | Ubuntu 20.04
-3.1.301-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/bionic/amd64/Dockerfile) | Ubuntu 18.04
-2.1.807-stretch, 2.1-stretch, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/stretch/amd64/Dockerfile) | Debian 9
-2.1.807-alpine3.12, 2.1-alpine3.12, 2.1.807-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-2.1.807-alpine3.11, 2.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-2.1.807-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/focal/amd64/Dockerfile) | Ubuntu 20.04
-2.1.807-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/bionic/amd64/Dockerfile) | Ubuntu 18.04
+3.1.301-buster, 3.1-buster, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/buster/amd64/Dockerfile) | Debian 10
+3.1.301-alpine3.12, 3.1-alpine3.12, 3.1.301-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+3.1.301-alpine3.11, 3.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+3.1.301-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/focal/amd64/Dockerfile) | Ubuntu 20.04
+3.1.301-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/bionic/amd64/Dockerfile) | Ubuntu 18.04
+2.1.807-stretch, 2.1-stretch, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/stretch/amd64/Dockerfile) | Debian 9
+2.1.807-alpine3.12, 2.1-alpine3.12, 2.1.807-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+2.1.807-alpine3.11, 2.1-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+2.1.807-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/focal/amd64/Dockerfile) | Ubuntu 20.04
+2.1.807-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/bionic/amd64/Dockerfile) | Ubuntu 18.04
 
 ## Linux arm64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.301-buster-arm64v8, 3.1-buster-arm64v8, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/buster/arm64v8/Dockerfile) | Debian 10
-3.1.301-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/focal/arm64v8/Dockerfile) | Ubuntu 20.04
-3.1.301-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/bionic/arm64v8/Dockerfile) | Ubuntu 18.04
+3.1.301-buster-arm64v8, 3.1-buster-arm64v8, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/buster/arm64v8/Dockerfile) | Debian 10
+3.1.301-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+3.1.301-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/bionic/arm64v8/Dockerfile) | Ubuntu 18.04
 
 ## Linux arm32 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-3.1.301-buster-arm32v7, 3.1-buster-arm32v7, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/buster/arm32v7/Dockerfile) | Debian 10
-3.1.301-bionic-arm32v7, 3.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
-2.1.807-stretch-arm32v7, 2.1-stretch-arm32v7, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/stretch/arm32v7/Dockerfile) | Debian 9
-2.1.807-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
+3.1.301-buster-arm32v7, 3.1-buster-arm32v7, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/buster/arm32v7/Dockerfile) | Debian 10
+3.1.301-bionic-arm32v7, 3.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
+2.1.807-stretch-arm32v7, 2.1-stretch-arm32v7, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/stretch/arm32v7/Dockerfile) | Debian 9
+2.1.807-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
 ## Windows Server, version 2004 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.301-nanoserver-2004, 3.1-nanoserver-2004, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-2004/amd64/Dockerfile)
-2.1.807-nanoserver-2004, 2.1-nanoserver-2004, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-2004/amd64/Dockerfile)
+3.1.301-nanoserver-2004, 3.1-nanoserver-2004, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-2004/amd64/Dockerfile)
+2.1.807-nanoserver-2004, 2.1-nanoserver-2004, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-2004/amd64/Dockerfile)
 
 ## Windows Server, version 1909 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.301-nanoserver-1909, 3.1-nanoserver-1909, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1909/amd64/Dockerfile)
-2.1.807-nanoserver-1909, 2.1-nanoserver-1909, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1909/amd64/Dockerfile)
+3.1.301-nanoserver-1909, 3.1-nanoserver-1909, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-1909/amd64/Dockerfile)
+2.1.807-nanoserver-1909, 2.1-nanoserver-1909, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-1909/amd64/Dockerfile)
 
 ## Windows Server, version 1903 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.301-nanoserver-1903, 3.1-nanoserver-1903, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1903/amd64/Dockerfile)
-2.1.807-nanoserver-1903, 2.1-nanoserver-1903, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1903/amd64/Dockerfile)
+3.1.301-nanoserver-1903, 3.1-nanoserver-1903, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-1903/amd64/Dockerfile)
+2.1.807-nanoserver-1903, 2.1-nanoserver-1903, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-1903/amd64/Dockerfile)
 
 ## Windows Server 2019 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-3.1.301-nanoserver-1809, 3.1-nanoserver-1809, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1809/amd64/Dockerfile)
-2.1.807-nanoserver-1809, 2.1-nanoserver-1809, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1809/amd64/Dockerfile)
+3.1.301-nanoserver-1809, 3.1-nanoserver-1809, 3.1.301, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-1809/amd64/Dockerfile)
+2.1.807-nanoserver-1809, 2.1-nanoserver-1809, 2.1.807, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-1809/amd64/Dockerfile)
 
 You can retrieve a list of all available tags for dotnet/core/sdk at https://mcr.microsoft.com/v2/dotnet/core/sdk/tags/list.
 

README.sdk.preview.md

@@ -61,47 +61,47 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/sa
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.100-preview.5-buster-slim, 5.0-buster-slim, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/amd64/Dockerfile) | Debian 10
-5.0.100-preview.5-alpine3.12, 5.0-alpine3.12, 5.0.100-preview.5-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/alpine3.12/amd64/Dockerfile) | Alpine 3.12
-5.0.100-preview.5-alpine3.11, 5.0-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/alpine3.11/amd64/Dockerfile) | Alpine 3.11
-5.0.100-preview.5-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/focal/amd64/Dockerfile) | Ubuntu 20.04
+5.0.100-preview.5-buster-slim, 5.0-buster-slim, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/buster-slim/amd64/Dockerfile) | Debian 10
+5.0.100-preview.5-alpine3.12, 5.0-alpine3.12, 5.0.100-preview.5-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/alpine3.12/amd64/Dockerfile) | Alpine 3.12
+5.0.100-preview.5-alpine3.11, 5.0-alpine3.11 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/alpine3.11/amd64/Dockerfile) | Alpine 3.11
+5.0.100-preview.5-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/focal/amd64/Dockerfile) | Ubuntu 20.04
 
 ## Linux arm64 Tags
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.100-preview.5-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/arm64v8/Dockerfile) | Debian 10
-5.0.100-preview.5-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+5.0.100-preview.5-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/buster-slim/arm64v8/Dockerfile) | Debian 10
+5.0.100-preview.5-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04
 
 ## Linux arm32 Tags
 ##### .NET 5.0 Preview Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-5.0.100-preview.5-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/arm32v7/Dockerfile) | Debian 10
+5.0.100-preview.5-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/buster-slim/arm32v7/Dockerfile) | Debian 10
 
 ## Windows Server, version 2004 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.100-preview.5-nanoserver-2004, 5.0-nanoserver-2004, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-2004/amd64/Dockerfile)
+5.0.100-preview.5-nanoserver-2004, 5.0-nanoserver-2004, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-2004/amd64/Dockerfile)
 
 ## Windows Server, version 1909 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.100-preview.5-nanoserver-1909, 5.0-nanoserver-1909, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1909/amd64/Dockerfile)
+5.0.100-preview.5-nanoserver-1909, 5.0-nanoserver-1909, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-1909/amd64/Dockerfile)
 
 ## Windows Server, version 1903 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.100-preview.5-nanoserver-1903, 5.0-nanoserver-1903, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1903/amd64/Dockerfile)
+5.0.100-preview.5-nanoserver-1903, 5.0-nanoserver-1903, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-1903/amd64/Dockerfile)
 
 ## Windows Server 2019 amd64 Tags
 ##### .NET 5.0 Preview Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.100-preview.5-nanoserver-1809, 5.0-nanoserver-1809, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1809/amd64/Dockerfile)
+5.0.100-preview.5-nanoserver-1809, 5.0-nanoserver-1809, 5.0.100-preview.5, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-1809/amd64/Dockerfile)
 
 You can retrieve a list of all available tags for dotnet/sdk at https://mcr.microsoft.com/v2/dotnet/sdk/tags/list.
 

eng/common/build.ps1

@@ -61,7 +61,7 @@ try {
         $args += " --path " + ($Paths -join " --path ")
     }
     else {
-        $args += " --path '$Version/*'"
+        $args += " --path 'src/*/$Version/*'"
     }
 
     if ($Manifest) {

eng/pipelines/dotnet-core-nightly.yml

@@ -6,9 +6,8 @@ trigger:
   paths:
     include:
     - manifest.json
-    - 2.1/*
-    - 3.1/*
-    - 5.0/*
+    - src/*
+
 pr:
   branches:
     include:

eng/update-dependencies/Program.cs

@@ -294,9 +294,11 @@ namespace Dotnet.Docker
             string dockerfileVersion, IEnumerable<IDependencyInfo> buildInfos)
         {
             string[] dockerfiles = Directory.GetFiles(
-                Path.Combine(RepoRoot, dockerfileVersion),
-                "Dockerfile",
-                SearchOption.AllDirectories);
+                    Path.Combine(RepoRoot, "src"), 
+                    "Dockerfile", 
+                    SearchOption.AllDirectories)
+                .Where(dockerfile => dockerfile.Contains($"{Path.DirectorySeparatorChar}{dockerfileVersion}{Path.DirectorySeparatorChar}"))
+                .ToArray();
 
             Trace.TraceInformation("Updating the following Dockerfiles:");
             Trace.TraceInformation(string.Join(Environment.NewLine, dockerfiles));