Merge pull request #97 from devcontainers/samrudhikhandale/port-fixes

Ports changes from vscode-dev-containers

Author: samruddhikhandale

src/base-alpine/.devcontainer/library-scripts/common-alpine.sh

@@ -138,7 +138,7 @@ else
     fi
 fi
 
-# Add add sudo support for non-root user
+# Add sudo support for non-root user
 if [ "${USERNAME}" != "root" ] && [ "${EXISTING_NON_ROOT_USER}" != "${USERNAME}" ]; then
     echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
     chmod 0440 /etc/sudoers.d/$USERNAME

src/dotnet/.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-# [Choice] .NET version: 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
+# [Choice] .NET version: 6.0-bullseye, 3.1-bullseye, 6.0-focal, 3.1-focal
 ARG VARIANT=6.0-bullseye-slim
 FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}
 

src/dotnet/README.md

@@ -9,7 +9,7 @@
 | *Categories* | Core, Languages |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/dotnet |
-| *Available image variants* | 3.1 / 3.1-focal, 5.0 / 5.0-focal, 6.0 /6.0-bullseye, 6.0-focal, 5.0-bullseye, 3.1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list)) |
+| *Available image variants* | 3.1 / 3.1-focal / 6.0 /6.0-bullseye, 6.0-focal, 3.1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Ubuntu (`-focal`), Debian (`-bullseye`) |
@@ -25,7 +25,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 
 - `mcr.microsoft.com/devcontainers/dotnet` (latest)
 - `mcr.microsoft.com/devcontainers/dotnet:3.1` (or `3.1-bullseye`, `3.1-focal` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/dotnet:5.0` (or `5.0-bullseye`, `5.0-focal` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/dotnet:6.0` (or `6.0-bullseye`, `6.0-focal` to pin to an OS version)
 
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:

src/dotnet/manifest.json

@@ -3,8 +3,6 @@
 	"variants": [
 		"6.0-bullseye-slim",
 		"6.0-focal",
-		"5.0-bullseye-slim",
-		"5.0-focal",
 		"3.1-bullseye",
 		"3.1-focal"
 	],
@@ -22,13 +20,6 @@
 				"linux/amd64",
 				"linux/arm64"
 			],
-			"5.0-focal": [
-				"linux/amd64"
-			],
-			"5.0-bullseye-slim": [
-				"linux/amd64",
-				"linux/arm64"
-			],
 			"3.1-focal": [
 				"linux/amd64"
 			],
@@ -42,14 +33,6 @@
 				"dotnet:${VERSION}-6.0",
 				"dotnet:${VERSION}-6.0-bullseye"
 			],
-			"5.0-focal": [
-				"dotnet:${VERSION}-5.0",
-				"dotnetcore:${VERSION}-5.0"
-			],
-			"5.0-bullseye-slim": [
-				"dotnet:${VERSION}-5.0-bullseye",
-				"dotnetcore:${VERSION}-5.0-bullseye"
-			],
 			"3.1-focal": [
 				"dotnet:${VERSION}-3.1",
 				"dotnetcore:${VERSION}-3.1"