build(sentry): Exec the sentry image's Python entrypoint - #4536
Merged
Merged
Conversation
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.
joshuarli
approved these changes
Sep 29, 2026
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.
Coverage Results 📊✅ 22 passed | Total: 22 | Pass Rate: 100% | Execution Time: 10m 55s 📊 Comparison with Base Branch
✨ Test counts unchanged from base. All tests are passing successfully. ✅ Patch coverage is 100.00% (no changed executable lines found; target 50%). Coverage diff@@ Coverage Diff @@
## master #4536 +/-##
==========================================
Coverage 95.54% 95.54% —%
==========================================
Files 5 5 —
Tracked lines 336 336 —
Branches 0 0 —
==========================================
Hits 321 321 —
Misses 15 15 —
Partials 0 0 —Generated by Coverage Action |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Exec
/docker_entrypoint.pyfromsentry/entrypoint.shinstead of sourcing/docker-entrypoint.sh. getsentry/sentry#125892 ports the sentry image's entrypoint to Python and keeps the.shonly as a shim for this call, so it can be removed once this lands.Also fixes
sentry-admin.sh --help, which ran the container a second time with the whole help text as the command. The old bash entrypoint echoed that argument in its error message, so the help still appeared by accident; with the Python entrypoint (already in:nightly) it printed only a traceback andtest_sentry_adminfailed.--helpnow starts one container instead of two.Prep for moving the sentry image to a distroless base.