From 02165dc4ac84f31c17407e3081197ddd5340e861 Mon Sep 17 00:00:00 2001
From: Tiago Godinho <54294+tiagogodinho@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:29:14 -0300
Subject: [PATCH] Ruby: Release 3.3 (#905)

Co-authored-by: Eljo George <eljog@github.com>
---
 src/ruby/.devcontainer/Dockerfile |  2 +-
 src/ruby/README.md                |  3 ++-
 src/ruby/manifest.json            | 24 ++++++++++++++++++++----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/ruby/.devcontainer/Dockerfile b/src/ruby/.devcontainer/Dockerfile
index 46b4ffd4a..0987633e7 100644
--- 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.2, 3.1, 3.0, 3-bookworm, 3.2-bookworm, 3.1-bookworm, 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.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
 ARG VARIANT=3-bookworm
 FROM ruby:${VARIANT}
 
diff --git a/src/ruby/README.md b/src/ruby/README.md
index 98f60192b..24d2cef70 100644
--- 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.2 / 3.2-bookworm, 3.1 / 3.1-bookworm, 3.0 / 3.0-bullseye, 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.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)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm` , and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -23,6 +23,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 
 - `mcr.microsoft.com/devcontainers/ruby`     (latest)
 - `mcr.microsoft.com/devcontainers/ruby:3`   (or `3-bookworm`, `3-bullseye`, `3-buster` to pin to an OS version)
+- `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)
diff --git a/src/ruby/manifest.json b/src/ruby/manifest.json
index a8749f950..c8ddde7a7 100644
--- a/src/ruby/manifest.json
+++ b/src/ruby/manifest.json
@@ -1,8 +1,10 @@
 {
 	"version": "1.0.7",
 	"variants": [
+		"3.3-bookworm",
 		"3.2-bookworm",
 		"3.1-bookworm",
+		"3.3-bullseye",
 		"3.2-bullseye",
 		"3.1-bullseye",
 		"3.0-bullseye",
@@ -11,9 +13,13 @@
 		"3.0-buster"
 	],
 	"build": {
-		"latest": "3.2-bookworm",
+		"latest": "3.3-bookworm",
 		"rootDistro": "debian",
 		"architectures": {
+			"3.3-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"3.2-bookworm": [
 				"linux/amd64",
 				"linux/arm64"
@@ -22,6 +28,10 @@
 				"linux/amd64",
 				"linux/arm64"
 			],
+			"3.3-bullseye": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"3.2-bullseye": [
 				"linux/amd64",
 				"linux/arm64"
@@ -48,22 +58,28 @@
 			"ruby:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"3.2-bookworm": [
+			"3.3-bookworm": [
 				"ruby:${VERSION}-3",
-				"ruby:${VERSION}-3.2",
+				"ruby:${VERSION}-3.3",
 				"ruby:${VERSION}-3-bookworm",
 				"ruby:${VERSION}-bookworm"
 			],
+			"3.2-bookworm": [
+				"ruby:${VERSION}-3.2"
+			],
 			"3.1-bookworm": [
 				"ruby:${VERSION}-3.1"
 			],
 			"3.0-bullseye": [
 				"ruby:${VERSION}-3.0"
 			],
-			"3.2-bullseye": [
+			"3.3-bullseye": [
 				"ruby:${VERSION}-3-bullseye",
 				"ruby:${VERSION}-bullseye"
 			],
+			"3.2-bullseye": [
+				"ruby:${VERSION}-3.2-bullseye"
+			],
 			"3.2-buster": [
 				"ruby:${VERSION}-3-buster",
 				"ruby:${VERSION}-buster"