chore(devcontainer): simpler setup w/o docker compose

Author: solnic

.devcontainer/.env.example

@@ -1,22 +1,20 @@
 # Devcontainer configuration
-RUBY_VERSION="3.4.9"
+
+RUBY_VERSION=3.4.9
 
 # E2E testing
-SENTRY_DSN="http://user:pass@sentry.localhost/project/42"
-# SENTRY_DSN_JS="http://user:pass@sentry-js.localhost/project/43"
-SENTRY_DSN_JS=""
+SENTRY_DSN=http://user:pass@sentry.localhost/project/42
+# SENTRY_DSN_JS=http://user:pass@sentry-js.localhost/project/43
+SENTRY_DSN_JS=
 
 SENTRY_E2E_RAILS_APP_PORT=4000
 SENTRY_E2E_SVELTE_APP_PORT=4001
 
-SENTRY_E2E_RAILS_APP_URL="http://localhost:4000"
-SENTRY_E2E_SVELTE_APP_URL="http://localhost:4001"
+SENTRY_E2E_RAILS_APP_URL=http://localhost:4000
+SENTRY_E2E_SVELTE_APP_URL=http://localhost:4001
 
 # ActiveJob queue adapter under test: async | inline | sidekiq | resque | delayed_job
-SENTRY_E2E_ACTIVE_JOB_ADAPTER="async"
-
-# Redis for the sidekiq/resque adapters (the Compose service is named "redis")
-REDIS_URL="redis://redis:6379"
+SENTRY_E2E_ACTIVE_JOB_ADAPTER=async
 
-# Faster builds with compose
-COMPOSE_BAKE=true
+# Redis for the sidekiq/resque adapters
+REDIS_URL=redis://localhost:6379

.devcontainer/Dockerfile

@@ -35,14 +35,14 @@ RUN userdel -r ubuntu 2>/dev/null || true \
   && groupadd --gid 1000 sentry \
   && useradd --uid 1000 --gid sentry --shell /bin/bash --create-home sentry
 
-WORKDIR /workspace/sentry
+WORKDIR /workspaces/sentry-ruby
 
-RUN chown -R sentry:sentry /workspace/sentry
+RUN chown -R sentry:sentry /workspaces/sentry-ruby
 
 ENV LANG=C.UTF-8 \
   BUNDLE_JOBS=4 \
   BUNDLE_RETRY=3 \
-  REDIS_HOST=redis \
+  REDIS_HOST=localhost \
   PATH=/home/sentry/.local/share/mise/shims:/home/sentry/.local/bin:$PATH
 
 USER sentry
@@ -52,32 +52,6 @@ USER sentry
 # directory content when a volume is first attached).
 RUN mkdir -p /home/sentry/bundle
 
-RUN curl https://mise.run | sh \
-  && echo 'eval "$(/home/sentry/.local/bin/mise activate bash)"' >> /home/sentry/.bashrc \
-  && echo 'eval "$(/home/sentry/.local/bin/mise activate zsh)"' >> /home/sentry/.zshenv
-
-# Pre-install Ruby at build time so the container starts immediately without
-# downloading it at runtime. Switching Ruby versions requires a rebuild.
-ARG RUBY_VERSION=latest
-
-# Java is always installed (required for JRuby). It is listed in .mise.toml so
-# it is available for all users regardless of which Ruby flavour they use.
-RUN echo "📦 Pre-installing java@temurin-21..." && \
-    /home/sentry/.local/bin/mise install "java@temurin-21" && \
-    /home/sentry/.local/bin/mise use --global "java@temurin-21"
-
-RUN echo "📦 Pre-installing ruby@${RUBY_VERSION} (precompiled)..." && \
-    MISE_RUBY_COMPILE=0 /home/sentry/.local/bin/mise install "ruby@${RUBY_VERSION}" && \
-    /home/sentry/.local/bin/mise use --global "ruby@${RUBY_VERSION}"
-
-# Node.js is always needed for the svelte-mini e2e app.
-RUN echo "📦 Pre-installing node@lts..." && \
-  /home/sentry/.local/bin/mise install "node@lts" && \
-  /home/sentry/.local/bin/mise use --global "node@lts"
-
-# Install headless Chromium via Playwright (includes all system dependencies).
-# Symlink the binary into ~/.local/bin which is already on PATH.
-RUN /home/sentry/.local/share/mise/shims/npx playwright install chromium --with-deps
-# Playwright lays out the binary under chrome-linux/ on arm64 and chrome-linux64/
-# on x86_64 (since Playwright 1.57), so the glob has to match both.
-RUN bash -c 'ln -sf /home/sentry/.cache/ms-playwright/chromium-*/chrome-linux*/chrome /home/sentry/.local/bin/chromium'
+# mise and the toolchain (Java, Ruby, Node, Chromium) are installed by the local
+# `./features/tools` dev container feature, which runs after this Dockerfile —
+# see devcontainer.json.

.devcontainer/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

.devcontainer/devcontainer-lock.json

@@ -1,17 +1,27 @@
 {
   "name": "sentry-ruby",
-  "dockerComposeFile": "docker-compose.yml",
-  "service": "sentry-dev",
-  "workspaceFolder": "/workspace/sentry",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": "..",
+    "args": {
+      "BASE_IMAGE": "${localEnv:BASE_IMAGE:ubuntu:24.04}"
+    }
+  },
+  "runArgs": ["--init"],
+  "forwardPorts": [4000, 4001, 6379],
+  "containerEnv": {
+    "REDIS_URL": "redis://localhost:6379"
+  },
   "features": {
     "ghcr.io/devcontainers/features/git:latest": {
       "ppa": false,
       "version": "2.54.0"
     },
     "ghcr.io/devcontainers/features/github-cli:latest": {},
     "ghcr.io/nils-geistmann/devcontainers-features/zsh:latest": {},
-    "ghcr.io/devcontainers/features/node:latest": {},
-    "ghcr.io/devcontainers-extra/features/npm-packages:latest": {},
+    "./features/tools": {
+      "rubyVersion": "${localEnv:RUBY_VERSION:4.0}"
+    },
     "ghcr.io/rocker-org/devcontainer-features/apt-packages:latest": {
       "packages": "inotify-tools,tzdata"
     }

.devcontainer/devcontainer.json

@@ -0,0 +1,13 @@
+{
+  "name": "sentry-ruby toolchain",
+  "id": "tools",
+  "version": "1.0.0",
+  "description": "Installs mise and pre-installs the sentry-ruby toolchain (Java, Ruby, Node) via mise plus headless Chromium via Playwright, baked into the image so the container starts without downloading anything.",
+  "options": {
+    "rubyVersion": {
+      "type": "string",
+      "default": "4.0",
+      "description": "Ruby version to pre-install and set as the global default (latest 4.0.x by default). Switching versions requires an image rebuild."
+    }
+  }
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+#
+# Installs mise system-wide and pre-installs the sentry-ruby toolchain (Java,
+# Ruby, Node) plus a headless Chromium, all baked into the image so the
+# container starts without downloading anything at runtime.
+#
+set -euo pipefail
+
+RUBY_VERSION="${RUBYVERSION:-latest}"
+USERNAME="${_REMOTE_USER:-sentry}"
+USER_HOME="${_REMOTE_USER_HOME:-/home/${USERNAME}}"
+
+# Install mise system-wide via the official installer. This downloads a prebuilt
+# binary from mise's CDN rather than the GitHub API, avoiding the API rate
+# limits the gh-release-based community feature hits on shared CI runners.
+echo "📦 Installing mise..."
+export MISE_INSTALL_PATH=/usr/local/bin/mise
+curl https://mise.run | sh
+MISE_BIN=/usr/local/bin/mise
+"$MISE_BIN" --version
+
+# Activate mise for the remote user's interactive shells.
+echo "eval \"\$(${MISE_BIN} activate bash)\"" >> "${USER_HOME}/.bashrc"
+echo "eval \"\$(${MISE_BIN} activate zsh)\"" >> "${USER_HOME}/.zshenv"
+chown "${USERNAME}:${USERNAME}" "${USER_HOME}/.bashrc" "${USER_HOME}/.zshenv"
+
+# Run a command as the remote user with a sane PATH so mise writes tools into
+# the user's own data dir (~/.local/share/mise) rather than root's.
+as_user() {
+  sudo -u "${USERNAME}" -H env "PATH=${USER_HOME}/.local/bin:/usr/local/bin:/usr/bin:/bin" "$@"
+}
+
+# ~/.local/bin is on PATH but nothing creates it now that mise is installed
+# system-wide; ensure it exists for the Chromium symlink below.
+as_user mkdir -p "${USER_HOME}/.local/bin"
+
+# Java is always installed (required for JRuby) and listed in .mise.toml so it
+# is available regardless of which Ruby flavour is used.
+echo "📦 Pre-installing java@temurin-21..."
+as_user "$MISE_BIN" install "java@temurin-21"
+as_user "$MISE_BIN" use --global "java@temurin-21"
+
+# Pre-install Ruby (precompiled) so the container starts immediately.
+echo "📦 Pre-installing ruby@${RUBY_VERSION} (precompiled)..."
+as_user env MISE_RUBY_COMPILE=0 "$MISE_BIN" install "ruby@${RUBY_VERSION}"
+as_user "$MISE_BIN" use --global "ruby@${RUBY_VERSION}"
+
+# Node.js is always needed for the svelte-mini e2e app.
+echo "📦 Pre-installing node@lts..."
+as_user "$MISE_BIN" install "node@lts"
+as_user "$MISE_BIN" use --global "node@lts"
+
+# Install headless Chromium via Playwright (includes all system dependencies)
+# and symlink the binary into ~/.local/bin which is already on PATH.
+echo "📦 Installing headless Chromium via Playwright..."
+as_user "${USER_HOME}/.local/share/mise/shims/npx" playwright install chromium --with-deps
+# Playwright lays out the binary under chrome-linux/ on arm64 and chrome-linux64/
+# on x86_64 (since Playwright 1.57), so the glob has to match both.
+as_user bash -c "ln -sf ${USER_HOME}/.cache/ms-playwright/chromium-*/chrome-linux*/chrome ${USER_HOME}/.local/bin/chromium"
+
+echo "✅ Toolchain pre-install completed!"

.devcontainer/features/tools/devcontainer-feature.json

@@ -2,31 +2,34 @@
 #
 # Container entrypoint. Ruby and other toolchains are pre-installed in the
 # image; this script only handles per-run setup (ownership, mise activation)
-# and hands off to whatever docker-compose passes as `command`.
+# and hands off to whatever command is passed at runtime.
 #
 set -euo pipefail
 
-cd /workspace/sentry
+cd /workspaces/sentry-ruby
 
 # In CI the workspace is checked out by the runner user (e.g. UID 1001) and
 # then bind-mounted into the container where we run as sentry (UID 1000).
 # Fix ownership once here so bundler, git, etc. can write freely.
-sudo chown -R sentry:sentry /workspace/sentry 2>/dev/null || true
-MISE_BIN="/home/sentry/.local/bin/mise"
+sudo chown -R sentry:sentry /workspaces/sentry-ruby 2>/dev/null || true
+
+# mise is installed system-wide by the tools dev container feature, so it lives
+# on PATH (typically /usr/local/bin/mise).
+MISE_BIN="$(command -v mise || true)"
 
 # Git also refuses to operate in directories owned by a different user.
-git config --global --add safe.directory /workspace/sentry 2>/dev/null || true
+git config --global --add safe.directory /workspaces/sentry-ruby 2>/dev/null || true
 
-if [[ ! -x "$MISE_BIN" ]]; then
-  echo "❌ mise not found at $MISE_BIN (it should be installed by the Dockerfile)"
+if [[ -z "$MISE_BIN" || ! -x "$MISE_BIN" ]]; then
+  echo "❌ mise not found on PATH (it should be installed by the tools dev container feature)"
   exit 1
 fi
 
 # Activate mise for this shell so PATH/shims are resolved correctly.
 eval "$("$MISE_BIN" activate bash)"
 
 # Trust the workspace config so mise will use it without prompting.
-"$MISE_BIN" trust /workspace/sentry >/dev/null
+"$MISE_BIN" trust /workspaces/sentry-ruby >/dev/null
 
 if [[ $# -eq 0 ]]; then
   exec sleep infinity

.devcontainer/features/tools/install.sh

@@ -25,7 +25,7 @@ class SetupScript
       only_npm: false,
       with_foreman: false
     }
-    @workspace_root = '/workspace/sentry'
+    @workspace_root = '/workspaces/sentry-ruby'
   end
 
   def run(args)