Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Ruby 3.4 #1276

Merged
merged 5 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ruby/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [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
# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.4, 3.3, 3.2, 3.1, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 3.1-bookworm, 3-bullseye, 3.4-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}

Expand All @@ -14,4 +14,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# RUN gem install <your-gem-names-here>

# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
3 changes: 2 additions & 1 deletion src/ruby/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-bullseye, 3.3-bullseye, 3.2-bullseye, 3.1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
| *Available image variants* | 3 / 3-bookworm, 3.4 / 3.4-bookworm, 3.3 / 3.3-bookworm, 3.2 / 3.2-bookworm, 3.1 / 3.1-bookworm, 3-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye, 3.1-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 |
| *Container host OS support* | Linux, macOS, Windows |
| *Container OS* | Debian |
Expand All @@ -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` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/ruby:3.4` (or `3.4-bookworm`, `3.4-bullseye` 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` to pin to an OS version)
- `mcr.microsoft.com/devcontainers/ruby:3.1` (or `3.1-bookworm`, `3.1-bullseye` to pin to an OS version)
Expand Down
24 changes: 20 additions & 4 deletions src/ruby/manifest.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
{
"version": "1.1.14",
"variants": [
"3.4-bookworm",
"3.3-bookworm",
"3.2-bookworm",
"3.1-bookworm",
"3.4-bullseye",
"3.3-bullseye",
"3.2-bullseye",
"3.1-bullseye"
],
"build": {
"latest": "3.3-bookworm",
"latest": "3.4-bookworm",
"rootDistro": "debian",
"architectures": {
"3.4-bookworm": [
"linux/amd64",
"linux/arm64"
],
"3.3-bookworm": [
"linux/amd64",
"linux/arm64"
Expand All @@ -24,6 +30,10 @@
"linux/amd64",
"linux/arm64"
],
"3.4-bullseye": [
"linux/amd64",
"linux/arm64"
],
"3.3-bullseye": [
"linux/amd64",
"linux/arm64"
Expand All @@ -41,22 +51,28 @@
"ruby:${VERSION}-${VARIANT}"
],
"variantTags": {
"3.3-bookworm": [
"3.4-bookworm": [
"ruby:${VERSION}-3",
"ruby:${VERSION}-3.3",
"ruby:${VERSION}-3.4",
"ruby:${VERSION}-3-bookworm",
"ruby:${VERSION}-bookworm"
],
"3.3-bookworm": [
"ruby:${VERSION}-3.3"
],
"3.2-bookworm": [
"ruby:${VERSION}-3.2"
],
"3.1-bookworm": [
"ruby:${VERSION}-3.1"
],
"3.3-bullseye": [
"3.4-bullseye": [
"ruby:${VERSION}-3-bullseye",
"ruby:${VERSION}-bullseye"
],
"3.3-bullseye": [
"ruby:${VERSION}-3.3-bullseye"
],
"3.2-bullseye": [
"ruby:${VERSION}-3.2-bullseye"
]
Expand Down
Loading