Skip to content

Commit 0653f50

Browse files
committed
WIP
1 parent 234187f commit 0653f50

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

.devcontainer/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,22 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
5757

5858
USER sentry
5959

60+
COPY entrypoint-sentry-dev.sh /workspace/entrypoint.sh
61+
62+
ENTRYPOINT ["/workspace/entrypoint.sh"]
63+
6064
FROM build AS rails-mini
6165

6266
USER sentry
6367

6468
COPY entrypoint-rails-mini.sh /workspace/rails-entrypoint.sh
6569

66-
ENTRYPOINT ["/workspace/rails-entrypoint.sh"]
70+
ENTRYPOINT ["/workspace/entrypoint.sh"]
6771

6872
FROM build AS svelte-mini
6973

7074
USER sentry
7175

72-
COPY entrypoint-svelte-mini.sh /usr/local/bin/svelte-entrypoint.sh
76+
COPY entrypoint-svelte-mini.sh /workspace/entrypoint.sh
7377

74-
ENTRYPOINT ["/usr/local/bin/svelte-entrypoint.sh"]
78+
ENTRYPOINT ["/workspace/entrypoint.sh"]

.devcontainer/docker-compose.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ services:
1111
- ..:/workspace/sentry:cached
1212
- sentry_e2e_logs:/workspace/sentry/log
1313
- sentry_ruby_gems:/workspace/gems
14+
working_dir: /workspace/sentry
1415
command: sleep infinity
15-
post_start:
16-
- command: .devcontainer/setup --with-foreman
17-
entrypoint: .devcontainer/entrypoint-sentry-dev.sh
1816
env_file: [".env"]
1917
depends_on:
2018
- redis
@@ -32,7 +30,6 @@ services:
3230
- sentry_e2e_logs:/workspace/sentry/log
3331
- sentry_ruby_gems:/workspace/gems
3432
working_dir: /workspace/sentry
35-
entrypoint: .devcontainer/entrypoint-sentry-test.sh
3633
environment:
3734
- REDIS_URL=${REDIS_URL:-redis://redis:6379/0}
3835
env_file: [".env"]
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/bin/bash
2+
23
set -e
34

5+
sudo chown -R sentry:sentry /workspace/sentry/log
6+
47
cd /workspace/sentry/spec/apps/rails-mini
58

69
echo "Installing Ruby dependencies for Rails mini..."
710
bundle install
811

9-
sudo chown -R sentry:sentry /workspace/sentry/log
10-
1112
exec "$@"

.devcontainer/entrypoint-sentry-test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#!/bin/bash
2+
23
set -e
34

5+
sudo chown -R sentry:sentry /workspace/sentry/log
6+
47
echo "Setting up sentry-test environment..."
58
cd /workspace/sentry
69

7-
sudo chown -R sentry:sentry /workspace/sentry
810
git config --global --add safe.directory /workspace/sentry
911

10-
# Only bundle install in the root folder for e2e test execution
1112
echo "Installing bundle dependencies in root folder..."
1213
bundle install
1314

spec/apps/rails-mini/app.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class RailsMiniApp < Rails::Application
1919
config.api_only = true
2020
config.force_ssl = false
2121

22-
# Validate DSN before starting
2322
initializer :validate_dsn, before: :configure_sentry do
2423
dsn_string = ENV["SENTRY_DSN"]
2524

@@ -35,7 +34,6 @@ class RailsMiniApp < Rails::Application
3534
puts "DSN must include host, path, public_key, and project_id"
3635
exit(1)
3736
end
38-
puts "✅ SENTRY_DSN validation passed: #{dsn_string}"
3937
rescue URI::InvalidURIError => e
4038
puts "ERROR: Invalid SENTRY_DSN format: #{e.message}"
4139
exit(1)

0 commit comments

Comments
 (0)