Add Support for Ruby 4.0.0 (#1724)

* Update Ruby version to 4.x in Dockerfile and manifest

* Revert "Update Ruby version to 4.x in Dockerfile and manifest"

This reverts commit 6f2824f.

* Update Ruby version to 4.x in Dockerfile, README, and manifest

* Add missing variant tags for Ruby 3.3 and 3.2 on bullseye

* Update Ruby version choice in Dockerfile

* Modify Ruby version entries in manifest.json

Updated Ruby version entries for various distributions.

* Add Ruby 3.3 and 3.2 versions to manifest.json

Author: sireeshajonnalagadda

src/ruby/.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
-# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.4, 3.3, 3.2, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 3-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye, 3-buster, 3.2-buster
-ARG VARIANT=3-trixie
+# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 4, 3.4, 3.3, 3.2, 4-trixie, 4-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 4-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye
+ARG VARIANT=4-trixie
 FROM ruby:${VARIANT}
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

src/ruby/README.md

@@ -9,8 +9,8 @@
 | *Categories* | Core, Languages |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/ruby |
-| *Available image variants* | 3 / 3-trixie, 3.4 / 3.4-trixie, 3.3 / 3.3-trixie, 3.2 / 3.2-trixie, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 3-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
-| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm` , and `bullseye` variants |
+| *Available image variants* | 4 / 4-trixie, 4-bookworm, 4-bullseye, 3.4 / 3.4-trixie, 3.3 / 3.3-trixie, 3.2 / 3.2-trixie, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 3-bullseye, 3.4-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
+| *Published image architecture(s)* | x86-64, arm64/aarch64 for `trixie`, `bookworm` , and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
 | *Languages, platforms* | Ruby |
@@ -22,7 +22,7 @@ See **[history](history)** for information on the contents of published images.
 You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own  `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
 
 - `mcr.microsoft.com/devcontainers/ruby`     (latest)
-- `mcr.microsoft.com/devcontainers/ruby:3`   (or `3-trixie`, `3-bookworm`, `3-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/ruby:4`   (or `4-trixie`, `4-bookworm`, `4-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/ruby:3.4` (or `3.4-trixie`, `3.4-bookworm`, `3.4-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/ruby:3.3` (or `3.3-trixie`, `3.3-bookworm`, `3.3-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/ruby:3.2` (or `3.2-trixie`, `3.2-bookworm`, `3.2-bullseye` to pin to an OS version)
@@ -31,11 +31,11 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 
-- `mcr.microsoft.com/devcontainers/ruby:2-3`     (or `2-3-trixie`, `2-3-bookworm`, `2-3-bullseye` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/ruby:2.0-3`   (or `2.0-3-trixie`, `2.0-3-bookworm`, `2.0-3-bullseye` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/ruby:2.0.0-3` (or `2.0.0-3-trixie`, `2.0.0-3-bookworm`, `2.0.0-3-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/ruby:3-4`     (or `3-4-trixie`, `3-4-bookworm`, `3-4-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/ruby:3.0-4`   (or `3.0-4-trixie`, `3.0-4-bookworm`, `3.0-4-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/ruby:3.0.0-4` (or `3.0.0-4-trixie`, `3.0.0-4-bookworm`, `3.0.0-4-bullseye` to pin to an OS version)
 
-However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `2-3.4`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
+However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `2-4.0`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list).
 

src/ruby/manifest.json

@@ -1,20 +1,35 @@
 {
-	"version": "2.0.5",
+	"version": "3.0.0",
 	"variants": [
+		"4.0-trixie",
 		"3.4-trixie",		
 		"3.3-trixie",
-		"3.2-trixie",		
+		"3.2-trixie",
+		"4.0-bookworm",		
 		"3.4-bookworm",		
 		"3.3-bookworm",
 		"3.2-bookworm",
+		"4.0-bullseye",
 		"3.4-bullseye",		
 		"3.3-bullseye",
 		"3.2-bullseye"
 	],
 	"build": {
-		"latest": "3.4-trixie",
+		"latest": "4.0-trixie",
 		"rootDistro": "debian",
 		"architectures": {
+			"4.0-trixie": [
+				"linux/amd64",
+				"linux/arm64"
+			],
+			"4.0-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],
+			"4.0-bullseye": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"3.4-trixie": [
 				"linux/amd64",
 				"linux/arm64"
@@ -56,21 +71,34 @@
 			"ruby:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
+			"4.0-trixie": [
+				"ruby:${VERSION}-4",
+				"ruby:${VERSION}-4.0",
+				"ruby:${VERSION}-4-trixie",
+				"ruby:${VERSION}-trixie"
+			],
+			"4.0-bookworm": [
+				"ruby:${VERSION}-4-bookworm",
+				"ruby:${VERSION}-bookworm"
+			],
+			"4.0-bullseye": [
+				"ruby:${VERSION}-4-bullseye",
+				"ruby:${VERSION}-bullseye"
+			],
 			"3.4-trixie": [
-				"ruby:${VERSION}-3",
 				"ruby:${VERSION}-3.4",
-				"ruby:${VERSION}-3-trixie",
-				"ruby:${VERSION}-trixie"
+				"ruby:${VERSION}-3.4-trixie"
 			],
 			"3.3-trixie": [
-				"ruby:${VERSION}-3.3"
+				"ruby:${VERSION}-3.3",
+				"ruby:${VERSION}-3.3-trixie"
 			],			
 			"3.2-trixie": [
-				"ruby:${VERSION}-3.2"
+				"ruby:${VERSION}-3.2",
+				"ruby:${VERSION}-3.2-trixie"
 			],			
 			"3.4-bookworm": [
-				"ruby:${VERSION}-3-bookworm",
-				"ruby:${VERSION}-bookworm"
+				"ruby:${VERSION}-3.4-bookworm"
 			],
 			"3.3-bookworm": [
 				"ruby:${VERSION}-3.3-bookworm"
@@ -79,16 +107,14 @@
 				"ruby:${VERSION}-3.2-bookworm"
 			],
 			"3.4-bullseye": [
-				"ruby:${VERSION}-3-bullseye",
-				"ruby:${VERSION}-bullseye"
+				"ruby:${VERSION}-3.4-bullseye"
 			],
 			"3.3-bullseye": [
 				"ruby:${VERSION}-3.3-bullseye"
 			],			
 			"3.2-bullseye": [
 				"ruby:${VERSION}-3.2-bullseye"
 			]
-		}
 	},
 	"dependencies": {
 		"image": "ruby:${VARIANT}",
@@ -122,4 +148,5 @@
 			}
 		}
 	}
-}
+}
+}