Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Update docker image to permit running as non-root and other tweaks for complement build #11431

Closed
wants to merge 6 commits into from
Closed

Update docker image to permit running as non-root and other tweaks for complement build #11431

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf61174
Ignore generated files from scripts-dev/complement.sh.
michaelkaye Nov 25, 2021
608d538
Swap to COMPLEMENT_SPAWN_HS_TIMEOUT_SECS env var.
michaelkaye Nov 25, 2021
e18ce18
Increase write access to /conf and /data within docker container for …
michaelkaye Nov 25, 2021
05d4115
Route /health checks through to the main synapse worker.
michaelkaye Nov 25, 2021
67e20f2
Allow Dockerfile-workers to run as non-root.
michaelkaye Nov 25, 2021
38bfadd
changelog.d
michaelkaye Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/conf-workers/nginx.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ server {
{{ worker_locations }}

# Send all other traffic to the main process
location ~* ^(\\/_matrix|\\/_synapse) {
location ~* ^(\\/_matrix|\\/_synapse|\\/health) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we instead arrange for the healthcheck to go to the workers? It seems a bit arbitrary just to send it to the main process.

(that might also be useful for complement to know when all the workers are ready, cf #10065 (comment))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a better attempt at this change in #11429 but left this in as atm this does respond on the synapse image and i thought it should do something on the synapse-workers image.

Happy to revert it as it isn't a complete health check

proxy_pass http://localhost:8080;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
Expand Down