[Ruby]-3.0 EOL- Images Issue #998 (#1026)

devcontainers · Apr 22, 2024 · c1db1f5 · c1db1f5
1 parent 24bdd6b
commit c1db1f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/src/ruby/.devcontainer/Dockerfile b/src/ruby/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.3, 3.2, 3.1, 3.0, 3-bookworm, 3.3-bookworm, 3.2-bookworm, 3.1-bookworm, 3-bullseye, 3.3-bullseye, 3.2-bullseye, 3.1-bullseye, 3.0-bullseye, 3-buster, 3.2-buster 3.1-buster, 3.0-buster
+# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.3, 3.2, 3.1, 3-bookworm, 3.3-bookworm, 3.2-bookworm, 3.1-bookworm, 3-bullseye, 3.3-bullseye, 3.2-bullseye, 3.1-bullseye, 3-buster, 3.2-buster 3.1-buster
 ARG VARIANT=3-bookworm
 FROM ruby:${VARIANT}
 

diff --git a/src/ruby/README.md b/src/ruby/README.md
@@ -9,7 +9,7 @@
 | *Categories* | Core, Languages |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/ruby |
-| *Available image variants* | 3 / 3-bookworm, 3.3 / 3.3-bookworm, 3.2 / 3.2-bookworm, 3.1 / 3.1-bookworm, 3.0 / 3.0-bullseye, 3-bullseye, 3.3-bullseye, 3.2-bullseye, 3.1-bullseye, 3-buster, 3.2-buster, 3.1-buster, 3.0-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
+| *Available image variants* | 3 / 3-bookworm, 3.3 / 3.3-bookworm, 3.2 / 3.2-bookworm, 3.1 / 3.1-bookworm, 3-bullseye, 3.3-bullseye, 3.2-bullseye, 3.1-bullseye, 3-buster, 3.2-buster, 3.1-buster, ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm` , and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -26,7 +26,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 - `mcr.microsoft.com/devcontainers/ruby:3.3` (or `3.3-bookworm`, `3.3-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/ruby:3.2` (or `3.2-bookworm`, `3.2-bullseye`, `3.2-buster` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/ruby:3.1` (or `3.1-bookworm`, `3.1-bullseye`, `3.1-buster` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/ruby:3.0` (or `3.0-bullseye`, `3.0-buster` to pin to an OS version)
 
 Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 

diff --git a/src/ruby/manifest.json b/src/ruby/manifest.json
@@ -7,10 +7,8 @@
 		"3.3-bullseye",
 		"3.2-bullseye",
 		"3.1-bullseye",
-		"3.0-bullseye",
 		"3.2-buster",
-		"3.1-buster",
-		"3.0-buster"
+		"3.1-buster"
 	],
 	"build": {
 		"latest": "3.3-bookworm",
@@ -40,18 +38,11 @@
 				"linux/amd64",
 				"linux/arm64"
 			],
-			"3.0-bullseye": [
-				"linux/amd64",
-				"linux/arm64"
-			],
 			"3.2-buster": [
 				"linux/amd64"
 			],
 			"3.1-buster": [
 				"linux/amd64"
-			],
-			"3.0-buster": [
-				"linux/amd64"
 			]
 		},
 		"tags": [
@@ -70,9 +61,6 @@
 			"3.1-bookworm": [
 				"ruby:${VERSION}-3.1"
 			],
-			"3.0-bullseye": [
-				"ruby:${VERSION}-3.0"
-			],
 			"3.3-bullseye": [
 				"ruby:${VERSION}-3-bullseye",
 				"ruby:${VERSION}-bullseye"