Merge pull request #11687 from neinteractiveliterature/spring-cleaning-2026

Spring cleaning 2026: remove unused dependencies and reduce Docker image size

Author: nbudin

.github/workflows/release.yml

@@ -53,11 +53,6 @@ jobs:
           node-version: ${{ steps.node-version.outputs.node-version }}
       - name: yarn install
         run: yarn install
-      - name: Deploy to Cloudflare
-        run: yarn run wrangler:deploy
-        env:
-          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
   notify-slack:
     runs-on: ubuntu-latest
     needs:

Dockerfile

@@ -65,23 +65,23 @@ ENV REVISION ${REVISION}
 
 USER root
 # iproute2, curl: generally useful network utilities that don't take much space
-# python3, xz-utils: node dependencies
 # libvips43, poppler-utils: activestorage dependencies
 # libjemalloc2: more efficient memory allocation in Ruby and Node
 # shared-mime-info: Rails dependency
 # libpq5: pg gem dependency
-RUN apt-get update && apt-get install -y --no-install-recommends iproute2 curl python3 libvips42 poppler-utils xz-utils libjemalloc2 shared-mime-info libpq5 gosu && rm -rf /var/lib/apt/lists/*
+# xz-utils: installed temporarily to extract the node tarball, then removed
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends iproute2 curl libvips42 poppler-utils xz-utils libjemalloc2 shared-mime-info libpq5 gosu \
+  && mkdir /opt/node \
+  && cd /opt/node \
+  && curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-$(echo ${TARGETARCH} | sed 's/amd64/x64/').tar.xz | tar xJ --strip-components=1 \
+  && rm -rf /opt/node/include /opt/node/lib/node_modules \
+  && apt-get purge -y xz-utils \
+  && apt-get autoremove -y \
+  && rm -rf /var/lib/apt/lists/*
 RUN useradd -ms $(which bash) www
-RUN mkdir /opt/node && \
-  cd /opt/node && \
-  curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-$(echo ${TARGETARCH} | sed 's/amd64/x64/').tar.xz | tar xJ --strip-components=1
 ENV PATH="/opt/node/bin:$PATH"
 
-# Set up flyctl
-RUN curl -L https://fly.io/install.sh | sh
-ENV FLYCTL_INSTALL="/root/.fly"
-ENV PATH="$FLYCTL_INSTALL/bin:$PATH"
-
 # Set up chamber for SSM-based secrets management
 RUN curl -fL "https://github.com/segmentio/chamber/releases/download/v${CHAMBER_VERSION}/chamber-v${CHAMBER_VERSION}-linux-${TARGETARCH}" \
   -o /usr/local/bin/chamber \

Gemfile

@@ -114,13 +114,6 @@ gem "rollbar"
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.1.0", require: false
 
-# Production profiling
-group :skylight do
-  gem "rbtrace"
-  gem "skylight"
-  gem "webrick" # we don't actually use it, but Skylight needs it on boot
-end
-
 group :development do
   gem "rack-mini-profiler", require: false
 

Gemfile.lock

@@ -415,7 +415,6 @@ GEM
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     openssl (4.0.2)
-    optimist (3.1.0)
     orm_adapter (0.5.0)
     ostruct (0.6.3)
     parallel (2.1.0)
@@ -511,10 +510,6 @@ GEM
     rbs (3.10.4)
       logger
       tsort
-    rbtrace (0.5.3)
-      ffi (>= 1.0.6)
-      msgpack (>= 0.4.3)
-      optimist (>= 3.0.0)
     rbtree (0.4.6)
     rdoc (7.2.0)
       erb
@@ -603,8 +598,6 @@ GEM
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     simpleidn (0.2.3)
-    skylight (7.1.1)
-      activesupport (>= 7.2.0)
     slop (3.6.0)
     sorted_set (1.1.0)
       rbtree
@@ -751,7 +744,6 @@ DEPENDENCIES
   rack-mini-profiler
   rails (= 8.1.3)
   rails-controller-testing
-  rbtrace
   readline (~> 0.0.4)
   recaptcha
   redcarpet
@@ -770,7 +762,6 @@ DEPENDENCIES
   shoryuken
   simplecov
   simplecov-cobertura
-  skylight
   sprockets-rails
   stackprof
   stripe
@@ -780,7 +771,6 @@ DEPENDENCIES
   twilio-ruby (~> 7.10.0)
   typeprof
   tzinfo-data
-  webrick
   will_paginate
   with_advisory_lock
   yard

bin/entrypoint.sh

@@ -22,13 +22,18 @@ if [ -n "$CHAMBER_SERVICE" ]; then
       exit 1
     fi
     # The endpoint may return {"token":"..."} JSON or a raw token string.
-    OIDC_TOKEN=$(echo "$OIDC_RESPONSE" | python3 -c "
-import sys, json
-data = sys.stdin.read().strip()
-try:
-    print(json.loads(data)['token'], end='')
-except (json.JSONDecodeError, KeyError):
-    print(data, end='')
+    OIDC_TOKEN=$(echo "$OIDC_RESPONSE" | node -e "
+let data = '';
+process.stdin.on('data', chunk => data += chunk);
+process.stdin.on('end', () => {
+  data = data.trim();
+  try {
+    const parsed = JSON.parse(data);
+    process.stdout.write(parsed.token !== undefined ? String(parsed.token) : data);
+  } catch (e) {
+    process.stdout.write(data);
+  }
+});
 ") || {
       echo "ERROR: Failed to extract OIDC token. Response was: $OIDC_RESPONSE" >&2
       exit 1