From 4cb55d2ab868a9d465e83c4ed8ddb73306c90277 Mon Sep 17 00:00:00 2001 From: Alexander Tarasov Date: Tue, 29 Sep 2026 20:45:35 +0200 Subject: [PATCH 1/2] build(sentry): Exec the sentry image's Python entrypoint Call /docker_entrypoint.py directly instead of sourcing /docker-entrypoint.sh, which getsentry/sentry#125892 turns into a compatibility shim so it can be removed. --- sentry/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry/entrypoint.sh b/sentry/entrypoint.sh index 7be738fdd7e..08faf1380b8 100755 --- a/sentry/entrypoint.sh +++ b/sentry/entrypoint.sh @@ -9,4 +9,4 @@ if [ -e /etc/sentry/requirements.txt ]; then echo "sentry/requirements.txt is deprecated, use sentry/enhance-image.sh - see https://develop.sentry.dev/self-hosted/#enhance-sentry-image" fi -source /docker-entrypoint.sh +exec python3 /docker_entrypoint.py "$@" From c6ccbaf47f5f3b9115a7badeb934c70a62345ea6 Mon Sep 17 00:00:00 2001 From: Alexander Tarasov Date: Tue, 29 Sep 2026 22:20:05 +0200 Subject: [PATCH 2/2] fix(sentry-admin): Run the container once for --help rename_sentry_bin_in_help_output already receives the help output as $1, but it ran the container again with its own arguments, passing the whole help text as the command. The bash entrypoint echoed that argument in its error message, so the help text still appeared by accident; the Python entrypoint in the current sentry image doesn't, so --help printed only a traceback. --- sentry-admin.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/sentry-admin.sh b/sentry-admin.sh index ef5608488f9..a46a7d8774d 100755 --- a/sentry-admin.sh +++ b/sentry-admin.sh @@ -35,8 +35,6 @@ rename_sentry_bin_in_help_output() { local help_prefix="$2" local usage_seen=false - output=$(invocation "$@") - echo -e "\n\n" while IFS= read -r line; do