diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c95ec47..404e102 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,17 +1,11 @@ // Documentation: -// - https://github.com/devcontainers/images/tree/main/src/jekyll +// - https://github.com/devcontainers/images/tree/main/src/jekyll # Don't use, it pegs Ruby 3.4 // - https://github.com/devcontainers/features/tree/main/src/node -// - https://code.visualstudio.com/docs/remote/ssh#_always-installed-extensions { "name": "Jekyll", - "image": "mcr.microsoft.com/devcontainers/jekyll", + "image": "mcr.microsoft.com/devcontainers/ruby:3.3-bookworm", // We want 3.3.4 exactly but let's try this "features": { - // Install rbenv (no Ruby yet); postCreateCommand installs the version from .ruby-version - "ghcr.io/devcontainers/features/ruby:2": { - "version": "none", - "versionManager": "rbenv" - }, // This feature cannot read .node-version, so update this pin alongside that file "ghcr.io/devcontainers/features/node:2": { "version": "24", @@ -19,7 +13,7 @@ "installYarnUsingApt": false // We use Yarn 4 via Corepack } }, - "postCreateCommand": "/bin/bash -c 'set -e; rbenv install --skip-existing; rbenv rehash; npm install -g corepack; corepack enable; corepack prepare yarn@4.18.0 --activate; yarn install --immutable; bundle install'", + "postCreateCommand": "/bin/sh -c 'set -e; npm install -g corepack; corepack enable; corepack prepare yarn@4.18.0 --activate; yarn install --immutable; bundle install'", "customizations": { "vscode": { "extensions": ["html-validate.vscode-html-validate"] diff --git a/README.md b/README.md index 7e84cb3..0ffd3ab 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Also you can run this to update your environment to match the GitHub Pages (no P bundle update --conservative # "--consersative" ignores updates that GitHub Pages is not using ``` -Keep [.ruby-version](.ruby-version) matching [the Ruby that GitHub Pages runs](https://pages.github.com/versions/) (used by CI, the dev container, and rbenv locally): +Keep [.ruby-version](.ruby-version) matching [the Ruby that GitHub Pages runs](https://pages.github.com/versions.json) (used by CI, the dev container, and rbenv locally): ```sh curl -s https://pages.github.com/versions.json | jq -r .ruby > .ruby-version # Send PR if changed