Do not recommend Debian 9/stretch (#1237)

Chuxel · web-flow · commit d50104d82d92 · 2022-01-13T17:28:59.000-08:00
diff --git a/container-templates/docker-compose/.devcontainer/Dockerfile b/container-templates/docker-compose/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 # Use the [Choice] comment to indicate option arguments that should appear in VS Code UX. Use a comma separated list.
 #
-# [Choice] Debian OS version: bullseye, buster, stretch
+# [Choice] Debian OS version: bullseye, buster
 ARG VARIANT="bullseye"
 FROM buildpack-deps:${VARIANT}-curl
 
diff --git a/container-templates/dockerfile/.devcontainer/Dockerfile b/container-templates/dockerfile/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 # Use the [Choice] comment to indicate option arguments that should appear in VS Code UX. Use a comma separated list.
 #
-# [Choice] Debian OS version: bullseye, buster, stretch
+# [Choice] Debian OS version: bullseye, buster
 ARG VARIANT="buster"
 FROM buildpack-deps:${VARIANT}-curl
 
diff --git a/containers/cpp/.devcontainer/Dockerfile b/containers/cpp/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Debian / Ubuntu version (use Debian 11/9, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
+# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
 ARG VARIANT=debian-11
 FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-${VARIANT}
 
diff --git a/containers/cpp/.devcontainer/base.Dockerfile b/containers/cpp/.devcontainer/base.Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Debian / Ubuntu version (use Debian 11/9, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
+# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
 ARG VARIANT=debian-10
 FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
 
diff --git a/containers/cpp/README.md b/containers/cpp/README.md
@@ -10,8 +10,8 @@
 | *Categories* | Core, Languages |
 | *Definition type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/vscode/devcontainers/cpp |
-| *Available image variants* | stretch, buster, bullseye, bionic, focal, hirsute ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/cpp/tags/list)) |
-| *Published image architecture(s)* | x86-64, aarch64/arm64 for `bullseye`, `stretch`, `bionic`, and `hirsute` variants |
+| *Available image variants* | buster, bullseye, bionic, focal, hirsute ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/cpp/tags/list)) |
+| *Published image architecture(s)* | x86-64, aarch64/arm64 for `bullseye`, `bionic`, and `hirsute` variants |
 | *Works in Codespaces* | Yes |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian, Ubuntu |
@@ -33,7 +33,6 @@ You can also directly reference pre-built versions of `.devcontainer/base.Docker
 - `mcr.microsoft.com/vscode/devcontainers/cpp:debian` (latest Debian GA)
 - `mcr.microsoft.com/vscode/devcontainers/cpp:bullseye` (or `debian-11`)
 - `mcr.microsoft.com/vscode/devcontainers/cpp:buster` (or `debian-10`)
-- `mcr.microsoft.com/vscode/devcontainers/cpp:stretch` (or `debian-9`)
 - `mcr.microsoft.com/vscode/devcontainers/cpp:ubuntu` (latest Ubuntu LTS)
 - `mcr.microsoft.com/vscode/devcontainers/cpp:hirsute` (or `ubuntu-21.04`)
 - `mcr.microsoft.com/vscode/devcontainers/cpp:focal` (or `ubuntu-20.04`)
diff --git a/containers/debian/.devcontainer/Dockerfile b/containers/debian/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Debian version (use bullseye or stretch on local arm64/Apple Silicon): bullseye, buster, stretch
+# [Choice] Debian version (use bullseye on local arm64/Apple Silicon): bullseye, buster
 ARG VARIANT=bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}
 
diff --git a/containers/debian/.devcontainer/base.Dockerfile b/containers/debian/.devcontainer/base.Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Debian version (use bullseye or stretch on local arm64/Apple Silicon): bullseye, buster, stretch
+# [Choice] Debian version (use bullseye on local arm64/Apple Silicon): bullseye, buster
 ARG VARIANT="bullseye"
 FROM buildpack-deps:${VARIANT}-curl
 
diff --git a/containers/debian/.devcontainer/devcontainer.json b/containers/debian/.devcontainer/devcontainer.json
@@ -2,8 +2,8 @@
 	"name": "Debian",
 	"build": {
 		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick an Debian version: bullseye, buster, stretch
-		// Use bullseye or stretch on local arm64/Apple Silicon.
+		// Update 'VARIANT' to pick an Debian version: bullseye, buster
+		// Use bullseye on local arm64/Apple Silicon.
 		"args": { "VARIANT": "bullseye" }
 	},
 
diff --git a/containers/debian/README.md b/containers/debian/README.md
@@ -10,8 +10,8 @@
 | *Categories* | Core, Other |
 | *Definition type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/vscode/devcontainers/base:debian |
-| *Available image variants* | stretch, buster, bullseye ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/base/tags/list)) |
-| *Published image architecture(s)* | x86-64, aarch64/arm64 for `bullseye` and `stretch` variants |
+| *Available image variants* | buster, bullseye ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/base/tags/list)) |
+| *Published image architecture(s)* | x86-64, aarch64/arm64 for `bullseye` variant |
 | *Works in Codespaces* | Yes |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -32,7 +32,6 @@ You can also directly reference pre-built versions of `.devcontainer/base.Docker
 - `mcr.microsoft.com/vscode/devcontainers/base:debian` (latest)
 - `mcr.microsoft.com/vscode/devcontainers/base:bullseye` (or `debian-11`)
 - `mcr.microsoft.com/vscode/devcontainers/base:buster` (or `debian-10`)
-- `mcr.microsoft.com/vscode/devcontainers/base:stretch` (or `debian-9`)
 
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# Use the [Choice] comment to indicate option arguments that should appear in VS Code UX. Use a comma separated list.`
`2`	`2`	`#`
`3`		`-# [Choice] Debian OS version: bullseye, buster, stretch`
	`3`	`+# [Choice] Debian OS version: bullseye, buster`
`4`	`4`	`ARG VARIANT="bullseye"`
`5`	`5`	`FROM buildpack-deps:${VARIANT}-curl`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# [Choice] Debian / Ubuntu version (use Debian 11/9, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04`
	`1`	`+# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04`
`2`	`2`	`ARG VARIANT=debian-11`
`3`	`3`	`FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-${VARIANT}`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# [Choice] Debian version (use bullseye or stretch on local arm64/Apple Silicon): bullseye, buster, stretch`
	`1`	`+# [Choice] Debian version (use bullseye on local arm64/Apple Silicon): bullseye, buster`
`2`	`2`	`ARG VARIANT=bullseye`
`3`	`3`	`FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}`
`4`	`4`