refa(devcontainer): rework to use mise for fast switching

.devcontainer/.env.example

@@ -1,8 +1,5 @@
-# Official Ruby images
-IMAGE="ruby:3.4.5-slim-bookworm"
-VERSION="3.4.5"
-
-# IMAGE="jruby:latest"
+# Devcontainer configuration
+RUBY_VERSION="3.4.9"
 
 # E2E testing
 SENTRY_DSN="http://user:pass@sentry.localhost/project/42"

.devcontainer/Dockerfile

@@ -1,13 +1,15 @@
-ARG IMAGE="ruby"
+ARG BASE_IMAGE=ubuntu:24.04
+FROM ${BASE_IMAGE}
 
-FROM ${IMAGE} AS build
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   sudo \
   gnupg \
   git \
   curl \
   wget \
+  ca-certificates \
   build-essential \
   pkg-config \
   libssl-dev \
@@ -21,27 +23,61 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libgdbm-dev \
   sqlite3 \
   libsqlite3-dev \
+  tzdata \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
 RUN echo "sentry ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/sentry \
   && chmod 0440 /etc/sudoers.d/sentry
 
-RUN groupadd --gid 1000 sentry \
+RUN userdel -r ubuntu 2>/dev/null || true \
+  && groupdel ubuntu 2>/dev/null || true \
+  && groupadd --gid 1000 sentry \
   && useradd --uid 1000 --gid sentry --shell /bin/bash --create-home sentry
 
 WORKDIR /workspace/sentry
 
 RUN chown -R sentry:sentry /workspace/sentry
 
-ARG VERSION
-ARG GEM_HOME="/workspace/sentry/vendor/gems/${VERSION}"
-
 ENV LANG=C.UTF-8 \
   BUNDLE_JOBS=4 \
   BUNDLE_RETRY=3 \
-  GEM_HOME=/workspace/sentry/vendor/gems/${VERSION} \
-  PATH=$PATH:${GEM_HOME}/bin \
-  REDIS_HOST=redis
+  REDIS_HOST=redis \
+  PATH=/home/sentry/.local/share/mise/shims:/home/sentry/.local/bin:$PATH
 
 USER sentry
+
+# Pre-create the bundle directory owned by sentry so that a Docker named volume
+# mounted here is initialised with the correct ownership (Docker copies image
+# 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'

.devcontainer/VERSION

@@ -0,0 +1 @@
+1

.devcontainer/devcontainer-lock.json

@@ -0,0 +1,29 @@
+{
+  "features": {
+    "ghcr.io/devcontainers-extra/features/npm-packages:latest": {
+      "version": "1.0.1",
+      "resolved": "ghcr.io/devcontainers-extra/features/npm-packages@sha256:0851cc312204f4044f22230986134026409565f9e632d8ab2b8c639e81cedd7c",
+      "integrity": "sha256:0851cc312204f4044f22230986134026409565f9e632d8ab2b8c639e81cedd7c"
+    },
+    "ghcr.io/devcontainers/features/github-cli:latest": {
+      "version": "1.1.0",
+      "resolved": "ghcr.io/devcontainers/features/github-cli@sha256:d22f50b70ed75339b4eed1ba9ecde3a1791f90e88d37936517e3bace0bbad671",
+      "integrity": "sha256:d22f50b70ed75339b4eed1ba9ecde3a1791f90e88d37936517e3bace0bbad671"
+    },
+    "ghcr.io/devcontainers/features/node:latest": {
+      "version": "2.0.0",
+      "resolved": "ghcr.io/devcontainers/features/node@sha256:fedd4c11f7adfb64283b578dddc7da906728daa25fa293351c9d913231acf12f",
+      "integrity": "sha256:fedd4c11f7adfb64283b578dddc7da906728daa25fa293351c9d913231acf12f"
+    },
+    "ghcr.io/nils-geistmann/devcontainers-features/zsh:latest": {
+      "version": "0.0.8",
+      "resolved": "ghcr.io/nils-geistmann/devcontainers-features/zsh@sha256:fd57a61a5187480b5e73f8041be5b67005be48f06503736df6cfdd8d0f38f3c4",
+      "integrity": "sha256:fd57a61a5187480b5e73f8041be5b67005be48f06503736df6cfdd8d0f38f3c4"
+    },
+    "ghcr.io/rocker-org/devcontainer-features/apt-packages:latest": {
+      "version": "1.0.2",
+      "resolved": "ghcr.io/rocker-org/devcontainer-features/apt-packages@sha256:87a4d7750a596a5db034ba8508782f31aebdc2ffe955c66aaecb33d9de2ecdae",
+      "integrity": "sha256:87a4d7750a596a5db034ba8508782f31aebdc2ffe955c66aaecb33d9de2ecdae"
+    }
+  }
+}

.devcontainer/devcontainer.json

@@ -5,12 +5,11 @@
   "workspaceFolder": "/workspace/sentry",
   "features": {
     "ghcr.io/devcontainers/features/github-cli:latest": {},
-    "ghcr.io/devcontainers-extra/features/mise:latest": {},
     "ghcr.io/nils-geistmann/devcontainers-features/zsh:latest": {},
     "ghcr.io/devcontainers/features/node:latest": {},
     "ghcr.io/devcontainers-extra/features/npm-packages:latest": {},
     "ghcr.io/rocker-org/devcontainer-features/apt-packages:latest": {
-      "packages": "inotify-tools"
+      "packages": "inotify-tools,tzdata"
     }
   },
   "customizations": {

.devcontainer/docker-compose.yml

@@ -5,24 +5,29 @@ services:
       context: ..
       dockerfile: .devcontainer/Dockerfile
       args:
-        IMAGE: ${IMAGE}
-        VERSION: ${VERSION}
+        BASE_IMAGE: ${BASE_IMAGE:-ubuntu:24.04}
+        RUBY_VERSION: ${RUBY_VERSION:-latest}
     volumes:
       - ..:/workspace/sentry:cached
     working_dir: /workspace/sentry
     env_file: [".env"]
 
   sentry-dev:
     <<: *sentry-build
-    entrypoint: ".devcontainer/run --service dev"
-    command: "sleep infinity"
+    entrypoint: [".devcontainer/run"]
     depends_on:
       - redis
 
   sentry-test:
     <<: *sentry-build
-    entrypoint: ".devcontainer/run --service test"
-    command: ["foreman", "start"]
+    profiles: ["e2e"]
+    entrypoint: [".devcontainer/run"]
+    command: ["mise", "run", "e2e:serve"]
+    environment:
+      BUNDLE_PATH: /home/sentry/bundle
+    volumes:
+      - ..:/workspace/sentry:cached
+      - bundle-gems:/home/sentry/bundle
     ports:
       - "${SENTRY_E2E_RAILS_APP_PORT}:4000"
       - "${SENTRY_E2E_SVELTE_APP_PORT}:4001"
@@ -33,3 +38,6 @@ services:
       - ALLOW_EMPTY_PASSWORD=yes
     ports:
       - "6379:6379"
+
+volumes:
+  bundle-gems:

.devcontainer/run

@@ -1,92 +1,35 @@
 #!/bin/bash
-
-set -e
+#
+# 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`.
+#
+set -euo pipefail
 
 cd /workspace/sentry
 
-sudo mkdir -p vendor/gems
-sudo chown -R sentry:sentry vendor/gems
-
-# git config --global --replace-all safe.directory /workspace/sentry
-# git config --global --replace-all safe.directory /workspace/sentry/vendor/gems/*
-
-sudo chown -R sentry:sentry .
-
-run_service_setup() {
-  local service="$1"
-
-  echo "🚀 Running setup for service: $service"
-
-  case "$service" in
-    "dev")
-      if ! .devcontainer/setup --with-foreman --only-bundle; then
-        echo "❌ Setup failed for service: $service"
-        exit 1
-      fi
-      ;;
-    "test")
-      if ! .devcontainer/setup --with-foreman --only .,spec/apps/rails-mini; then
-        echo "❌ Setup failed for service: $service"
-        exit 1
-      fi
-      ;;
-    *)
-      echo "❌ Unknown service: $service"
-      echo "Available services: dev, test"
-      exit 1
-      ;;
-  esac
+# 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"
 
-  echo "✅ Setup completed for service: $service"
-}
+# Git also refuses to operate in directories owned by a different user.
+git config --global --add safe.directory /workspace/sentry 2>/dev/null || true
 
-# Function to start services in background
-start_services_if_needed() {
-  # Check if we're running tests (bundle exec rake)
-  if [[ "$*" == *"bundle exec rake"* ]]; then
-    echo "🚀 Starting e2e services in background for test execution..."
-
-    # Start foreman in background
-    foreman start &
-    FOREMAN_PID=$!
-
-    # Wait for services to be ready
-    echo "⏳ Waiting for services to start..."
-    for i in {1..30}; do
-      if curl -f http://localhost:4000/health >/dev/null 2>&1 && \
-         curl -f http://localhost:4001/health >/dev/null 2>&1; then
-        echo "✅ Services are ready!"
-        break
-      fi
-
-      if [ $i -eq 30 ]; then
-        echo "❌ Services failed to start within timeout"
-        kill $FOREMAN_PID 2>/dev/null || true
-        exit 1
-      fi
-
-      sleep 2
-    done
-
-    # Set up cleanup trap
-    trap "echo '🧹 Stopping services...'; kill $FOREMAN_PID 2>/dev/null || true; wait $FOREMAN_PID 2>/dev/null || true" EXIT
-  fi
-}
+if [[ ! -x "$MISE_BIN" ]]; then
+  echo "❌ mise not found at $MISE_BIN (it should be installed by the Dockerfile)"
+  exit 1
+fi
 
-# Parse arguments
-if [ "$1" = "--service" ] && [ -n "$2" ]; then
-  service="$2"
-  shift 2
+# Activate mise for this shell so PATH/shims are resolved correctly.
+eval "$("$MISE_BIN" activate bash)"
 
-  run_service_setup "$service"
+# Trust the workspace config so mise will use it without prompting.
+"$MISE_BIN" trust /workspace/sentry >/dev/null
 
-  if [ $# -gt 0 ]; then
-    start_services_if_needed "$@"
-    exec "$@"
-  else
-    exec bash
-  fi
+if [[ $# -eq 0 ]]; then
+  exec sleep infinity
 else
-  start_services_if_needed "$@"
   exec "$@"
 fi

.devcontainer/setup

@@ -35,7 +35,6 @@ class SetupScript
 
     if should_run_bundle?
       cleanup_ruby_lsp_directories
-      update_rubygems_and_bundler
       install_bundle_dependencies
       install_foreman_gem if @options[:with_foreman]
     end
@@ -123,7 +122,7 @@ class SetupScript
         Dir.chdir(folder_path) do
           puts "   Installing dependencies for #{folder_path}..."
 
-          unless system("[ -f Gemfile.lock ] && rm Gemfile.lock; bundle install")
+          unless system("bundle install")
             puts "❌ Bundle install failed for #{folder}"
             exit 1
           end
@@ -136,28 +135,6 @@ class SetupScript
     end
   end
 
-  def update_rubygems_and_bundler
-    puts "📦 Updating RubyGems and Bundler..."
-
-    if RUBY_VERSION >= "3.0"
-      unless system("sudo gem update --system --silent")
-        puts "❌ RubyGems update failed"
-        exit 1
-      end
-    else
-      unless system("sudo gem update --silent --system 3.4.22")
-        puts "❌ RubyGems update failed"
-        exit 1
-      end
-
-      # sentry-sidekiq does not bundle with Bundler 2.5.x that ships with RubyGems 3.4.22
-      unless system("sudo gem install bundler -v 2.4.22")
-        puts "❌ Bundler installation failed"
-        exit 1
-      end
-    end
-  end
-
   def install_foreman_gem
     unless system('gem install foreman')
       puts "❌ Foreman gem installation failed"