Resolve #1111 (#1112)

Author: Chuxel

containers/dotnet-fsharp/.devcontainer/Dockerfile

@@ -4,12 +4,6 @@ FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-5.0
 ARG NODE_VERSION="lts/*"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
-# [Option] Install Azure CLI
-ARG INSTALL_AZURE_CLI="false"
-COPY library-scripts/azcli-debian.sh /tmp/library-scripts/
-RUN if [ "$INSTALL_AZURE_CLI" = "true" ]; then bash /tmp/library-scripts/azcli-debian.sh; fi \
-    && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
-
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 #     && apt-get -y install --no-install-recommends <your-package-list-here>

containers/dotnet-fsharp/.devcontainer/devcontainer.json

@@ -5,9 +5,7 @@
 		"dockerfile": "Dockerfile",
 		"args": {
 			// Options
-			"NODE_VERSION": "lts/*",
-			"INSTALL_AZURE_CLI": "false",
-			"UPGRADE_PACKAGES": "false"
+			"NODE_VERSION": "lts/*"
 		}
 	},
 

containers/dotnet-fsharp/.devcontainer/library-scripts/README.md

@@ -118,13 +118,13 @@ Given JavaScript front-end web client code written for use in conjunction with a
 }
 ```
 
-If you would like to install the Azure CLI update you can set the `INSTALL_AZURE_CLI` argument line in `.devcontainer/devcontainer.json`:
+If you would like to install the Azure CLI, you can reference [a dev container feature](https://aka.ms/vscode-remote/containers/dev-container-features) by adding the following to `.devcontainer/devcontainer.json`:
 
 ```json
-"args": {
-    "VARIANT": "3.1",
-    "NODE_VERSION": "14",
-    "INSTALL_AZURE_CLI": "true"
+{
+  "features": {
+    "azure-cli": "latest"
+  }
 }
 ```
 

containers/dotnet-fsharp/.devcontainer/library-scripts/azcli-debian.sh

@@ -6,12 +6,6 @@ FROM mcr.microsoft.com/vscode/devcontainers/dotnet:${VARIANT}
 ARG NODE_VERSION="none"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
-# [Option] Install Azure CLI
-ARG INSTALL_AZURE_CLI="false"
-COPY library-scripts/azcli-debian.sh /tmp/library-scripts/
-RUN if [ "$INSTALL_AZURE_CLI" = "true" ]; then bash /tmp/library-scripts/azcli-debian.sh; fi \
-    && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
-
 # Install SQL Tools: SQLPackage and sqlcmd
 COPY mssql/installSQLtools.sh installSQLtools.sh
 RUN bash ./installSQLtools.sh \

containers/dotnet-fsharp/README.md

@@ -6,12 +6,11 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        # [Choice] Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 6.0-bullseye, 6.0-buster
+        # Update 'VARIANT' to pick a version of .NET: 3.1, 5.0, 6.0
+        # Append -bullseye or -focal to pin to an OS version.
         VARIANT: 5.0-bullseye
-        # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+        # Optional version of Node.js
         NODE_VERSION: "lts/*"
-        # [Option] Install Azure CLI
-        INSTALL_AZURE_CLI: "false"
 
     volumes:
       - ..:/workspace:cached