Add build_images workflow

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
-# TAG=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 \
@@ -40,37 +38,13 @@ WORKDIR /workspace/sentry
 RUN chown -R sentry:sentry /workspace/sentry
 
 ARG VERSION
-ARG GEM_HOME="/workspace/gems/${VERSION}"
-
-RUN mkdir /workspace/gems && chown -R sentry:sentry /workspace/gems
+ARG GEM_HOME="/workspace/sentry/vendor/gems/${VERSION}"
 
 ENV LANG=C.UTF-8 \
   BUNDLE_JOBS=4 \
   BUNDLE_RETRY=3 \
-  GEM_HOME=/workspace/gems/${VERSION} \
+  GEM_HOME=/workspace/sentry/vendor/gems/${VERSION} \
   PATH=$PATH:${GEM_HOME}/bin \
   REDIS_HOST=redis
 
-FROM build AS dev
-
 USER sentry
-
-COPY .devcontainer/entrypoint.sh /workspace/entrypoint.sh
-
-ENTRYPOINT ["/workspace/entrypoint.sh"]
-
-FROM build AS test
-
-COPY . .
-
-RUN chown -R sentry:sentry .
-
-USER sentry
-
-RUN gem install foreman && \
-  bundle install && \
-  cd spec/apps/rails-mini && \
-  bundle install
-
-RUN cd spec/apps/svelte-mini && \
-  npm install

.devcontainer/docker-compose.yml

@@ -1,51 +1,40 @@
 services:
   sentry-build: &sentry-build
+    image: ${DOCKER_IMAGE:-sentry-ruby-devcontainer}:${DOCKER_TAG:-latest}
     build:
       context: ..
       dockerfile: .devcontainer/Dockerfile
-      target: test
       args:
         IMAGE: ${IMAGE}
-        VERSION: ${VERSION}
-        SENTRY_E2E_RAILS_APP_PORT: ${SENTRY_E2E_RAILS_APP_PORT}
-        SENTRY_E2E_SVELTE_APP_PORT: ${SENTRY_E2E_SVELTE_APP_PORT}
-        SENTRY_E2E_RAILS_APP_URL: ${SENTRY_E2E_RAILS_APP_URL}
-        SENTRY_E2E_SVELTE_APP_URL: ${SENTRY_E2E_SVELTE_APP_URL}
     volumes:
       - ..:/workspace/sentry:cached
-      - sentry_e2e_logs:/workspace/sentry/log
     working_dir: /workspace/sentry
-    environment:
-      - REDIS_URL=${REDIS_URL:-redis://redis:6379/0}
     env_file: [".env"]
 
   sentry-dev:
     <<: *sentry-build
-    command: sleep infinity
+    entrypoint: ".devcontainer/run --service dev"
+    command: "sleep infinity"
     depends_on:
       - redis
 
   sentry-test:
     <<: *sentry-build
+    entrypoint: ".devcontainer/run --service test"
     depends_on:
-      - redis
       - sentry-test-services
 
   sentry-test-services:
     <<: *sentry-build
+    entrypoint: ".devcontainer/run --service test-services"
     command: "foreman start"
     ports:
-      - ${SENTRY_E2E_RAILS_APP_PORT}
-      - ${SENTRY_E2E_SVELTE_APP_PORT}
+      - "${SENTRY_E2E_RAILS_APP_PORT}:4000"
+      - "${SENTRY_E2E_SVELTE_APP_PORT}:4001"
 
   redis:
     image: redis:latest
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
     ports:
       - "6379:6379"
-
-volumes:
-  sentry_e2e_logs:
-  sentry_ruby_gems:
-  sentry_node_modules:

.github/workflows/build_images.yml

@@ -0,0 +1,69 @@
+name: "Build & push devcontainer"
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - .devcontainer/**
+      - .github/workflows/build_images.yml
+  pull_request:
+    paths:
+      - .devcontainer/**
+      - .github/workflows/build_images.yml
+
+permissions:
+  contents: read
+  packages: write # Required for GHCR
+
+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: '${{ 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: |
+          echo "GHCR URL: ${{ steps.build.outputs.ghcr_image_url }}"