WIP

Author: solnic

.devcontainer/.env.example

@@ -1,11 +1,7 @@
 # Official Ruby images
-IMAGE=ruby
+IMAGE="ruby:3.4.5-slim-bookworm"
 
-# Adjust as needed
-VERSION=3.4.5
-
-# IMAGE=jruby
-# VERSION=latest
+# IMAGE="jruby:latest"
 
 # E2E testing
 SENTRY_DSN="http://user:pass@sentry.localhost/project/42"

.devcontainer/Dockerfile

@@ -1,8 +1,6 @@
 ARG IMAGE="ruby"
-ARG VERSION="3.4.5"
-ARG DISTRO="slim-bookworm"
 
-FROM ${IMAGE}:${VERSION}-${DISTRO} AS build
+FROM ${IMAGE} AS build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   sudo \

.github/workflows/build_images.yml

@@ -19,18 +19,50 @@ permissions:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_image:
+          - ruby:2.7.8-slim-bullseye
+          - ruby:3.0.7-slim-bullseye
+          - ruby:3.1.7-slim-bookworm
+          - ruby:3.2.9-slim-bookworm
+          - ruby:3.3.9-slim-bookworm
+          - ruby:3.4.5-slim-bookworm
+
     steps:
       - name: Check out current commit
         uses: actions/checkout@v4
 
+      - name: Generate short image name
+        id: image_name
+        run: |
+          ruby_image="${{ matrix.ruby_image }}"
+
+          if [[ "$ruby_image" == ruby:* ]]; then
+            version=$(echo "$ruby_image" | cut -d: -f2 | cut -d. -f1,2)
+            short_name="sentry-ruby-devcontainer-${version}"
+          elif [[ "$ruby_image" == jruby:latest ]]; then
+            short_name="sentry-ruby-devcontainer-jruby-latest"
+          elif [[ "$ruby_image" == jruby:* ]]; then
+            version=$(echo "$ruby_image" | cut -d: -f2 | cut -d. -f1,2)
+            short_name="sentry-ruby-devcontainer-jruby-${version}"
+          else
+            short_name="sentry-ruby-devcontainer-${ruby_image}"
+          fi
+
+          echo "short_name=${short_name}" >> $GITHUB_OUTPUT
+          echo "Generated short image name: ${short_name}"
+
       - name: Build and push devcontainer image
         id: build
         uses: getsentry/action-build-and-push-images@main
         with:
-          image_name: 'sentry-ruby-devcontainer-build'
+          image_name: '${{ steps.image_name.outputs.short_name }}'
           dockerfile_path: '.devcontainer/Dockerfile'
           ghcr: true
           publish_on_pr: true
+          build_args: |
+            IMAGE=${{ matrix.ruby_image }}
 
       - name: Use outputs
         run: |

.github/workflows/e2e_tests.yml

@@ -26,8 +26,8 @@ jobs:
         ruby_version: ["3.4.5"]
 
     env:
-      DOCKER_IMAGE: "ghcr.io/getsentry/sentry-ruby-devcontainer-build"
-      DOCKER_TAG: "bff2bf4c90959b3710d26499a2eed0911953a325"
+      DOCKER_IMAGE: "ghcr.io/getsentry/sentry-ruby-devcontainer-3.4"
+      DOCKER_TAG: "9c29d73a943de506a5990f7407c93663c80b44fd"
 
     steps:
       - name: Checkout code