WIP

Author: solnic

.devcontainer/Dockerfile

@@ -47,9 +47,7 @@ ENV LANG=C.UTF-8 \
   PATH=$PATH:${GEM_HOME}/bin \
   REDIS_HOST=redis
 
-USER sentry
-
-FROM base AS dev
+FROM build AS dev
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   chromium \
@@ -59,7 +57,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 USER sentry
 
-FROM base AS rails-mini
+FROM build AS rails-mini
 
 USER sentry
 

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 {
   "name": "sentry-ruby",
   "dockerComposeFile": "docker-compose.yml",
-  "service": "sentry",
+  "service": "sentry-dev",
   "workspaceFolder": "/workspace/sentry",
   "features": {
     "ghcr.io/devcontainers/features/github-cli": {},
@@ -25,6 +25,5 @@
       "rubyLsp.formatter": "auto"
     }
   },
-  "remoteUser": "sentry",
-  "postCreateCommand": ".devcontainer/setup --with-foreman"
+  "remoteUser": "sentry"
 }

.devcontainer/docker-compose.yml

@@ -5,15 +5,16 @@ services:
       dockerfile: Dockerfile
       target: dev
       args:
-        IMAGE: ${IMAGE}
-        VERSION: ${VERSION}
+        IMAGE: ${IMAGE:-ruby}
+        VERSION: ${VERSION:-3.4.5}
     volumes:
       - ..:/workspace/sentry:cached
       - sentry_e2e_logs:/workspace/sentry/log
       - sentry_ruby_gems:/workspace/gems
     command: sleep infinity
-    environment:
-      - REDIS_URL=${REDIS_URL:-redis://redis:6379/0}
+    post_start:
+      - command: .devcontainer/setup --with-foreman
+    entrypoint: .devcontainer/entrypoint-sentry-dev.sh
     env_file: [".env"]
     depends_on:
       - redis
@@ -39,6 +40,8 @@ services:
       - redis
       - sentry-rails-mini
       - sentry-svelte-mini
+    profiles:
+      - e2e
 
   sentry-rails-mini:
     build:

.gitignore

@@ -14,4 +14,4 @@ Gemfile.lock
 *.rdb
 .rgignore
 
-/node_modules/
+node_modules

Gemfile

@@ -1,45 +1,12 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
-git_source(:github) { |name| "https://github.com/#{name}.git" }
-
-gem "jar-dependencies" if RUBY_PLATFORM == "java"
-gem "rake", "~> 12.0"
-
-ruby_version = Gem::Version.new(RUBY_VERSION)
-
-# Development tools
-if ruby_version >= Gem::Version.new("2.7.0")
-  gem "debug", github: "ruby/debug", platform: :ruby
-  gem "irb"
-  gem "ruby-lsp-rspec" if ruby_version >= Gem::Version.new("3.0.0") && RUBY_PLATFORM != "java"
-end
-
-if RUBY_VERSION >= "3.5"
-  gem "cgi"
-end
-
-# For RSpec
-gem "rspec", "~> 3.0"
-gem "rspec-retry"
-gem "simplecov"
-gem "simplecov-cobertura", "~> 1.4"
-gem "rexml"
-
-if ruby_version >= Gem::Version.new("3.4")
-  gem "ostruct"
-end
+eval_gemfile "Gemfile.dev"
 
 group :e2e do
   gem "capybara"
   gem "selenium-webdriver"
 end
 
-group :rubocop do
-  gem "rubocop-rails-omakase"
-  gem "rubocop-packaging"
-end
-
 group :sentry do
   gem "sentry-ruby", path: "sentry-ruby"
   gem "sentry-rails", path: "sentry-rails"

Gemfile.dev

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) { |name| "https://github.com/#{name}.git" }
+
+gem "jar-dependencies" if RUBY_PLATFORM == "java"
+gem "rake", "~> 12.0"
+
+ruby_version = Gem::Version.new(RUBY_VERSION)
+
+# Development tools
+if ruby_version >= Gem::Version.new("2.7.0")
+  gem "debug", github: "ruby/debug", platform: :ruby
+  gem "irb"
+  gem "ruby-lsp-rspec" if ruby_version >= Gem::Version.new("3.0.0") && RUBY_PLATFORM != "java"
+end
+
+if RUBY_VERSION >= "3.5"
+  gem "cgi"
+end
+
+# For RSpec
+gem "rspec", "~> 3.0"
+gem "rspec-retry"
+gem "simplecov"
+gem "simplecov-cobertura", "~> 1.4"
+gem "rexml"
+
+if ruby_version >= Gem::Version.new("3.4")
+  gem "ostruct"
+end
+
+group :rubocop do
+  gem "rubocop-rails-omakase"
+  gem "rubocop-packaging"
+end

Procfile

@@ -1,2 +1,2 @@
-rails: cd spec/apps/rails-mini && bundle exec app.rb
+rails: cd spec/apps/rails-mini && bundle exec ruby app.rb
 svelte: cd spec/apps/svelte-mini && npm run dev

sentry-delayed_job/Gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
-eval_gemfile "../Gemfile"
+eval_gemfile "../Gemfile.dev"
 
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec

sentry-opentelemetry/Gemfile

@@ -3,13 +3,11 @@
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
-eval_gemfile "../Gemfile"
+eval_gemfile "../Gemfile.dev"
 
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec
 
-gem "ostruct" if RUBY_VERSION >= "3.4"
-
 gem "opentelemetry-sdk"
 gem "opentelemetry-instrumentation-rails"
 

sentry-rails/Gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
-eval_gemfile "../Gemfile"
+eval_gemfile "../Gemfile.dev"
 
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec