Skip to content

Use uv pip to install supervisor in workers image #18275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

AndrewFerr
Copy link
Member

@AndrewFerr AndrewFerr commented Mar 24, 2025

Do this to take advantage of the cache mount for uv, and to be consistent with how base requirements are installed with uv pip.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Code style is correct
    (run the linters)

@AndrewFerr AndrewFerr requested a review from a team as a code owner March 24, 2025 16:12
Do this to take advantage of the cache mount for uv, and to be
consistent with how base requirements are installed with uv pip.
@AndrewFerr AndrewFerr force-pushed the docker/uv-pip-for-supervisor branch from 96bb696 to 6501ba4 Compare March 25, 2025 12:17
@reivilibre reivilibre enabled auto-merge (squash) March 25, 2025 14:07
@AndrewFerr AndrewFerr mentioned this pull request Mar 28, 2025
3 tasks
@reivilibre reivilibre merged commit 90f3461 into element-hq:develop Apr 1, 2025
37 checks passed
@AndrewFerr AndrewFerr deleted the docker/uv-pip-for-supervisor branch April 1, 2025 17:45
sandhose pushed a commit that referenced this pull request Apr 30, 2025
- Use a `uv:python` image for the first build layer, to reduce the
number of intermediate images required, as the
main Dockerfile uses that image already
- Use a cache mount for `apt` commands
- Skip a pointless install of `redis-server`, since the redis Docker
image is copied from instead
- Move some RUN steps out of the final image layer & into the build
layer

Depends on #18275

### Pull Request Checklist

<!-- Please read
https://element-hq.github.io/synapse/latest/development/contributing_guide.html
before submitting your pull request -->

* [x] Pull request is based on the develop branch
* [x] Pull request includes a [changelog
file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog).
The entry should:
- Be a short description of your change which makes sense to users.
"Fixed a bug that prevented receiving messages from other servers."
instead of "Moved X method from `EventStore` to `EventWorkerStore`.".
  - Use markdown where necessary, mostly for `code blocks`.
  - End with either a period (.) or an exclamation mark (!).
  - Start with a capital letter.
- Feel free to credit yourself, by adding a sentence "Contributed by
@github_username." or "Contributed by [Your Name]." to the end of the
entry.
* [x] [Code
style](https://element-hq.github.io/synapse/latest/code_style.html) is
correct
(run the
[linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants