mirror of
https://github.com/1f349/dendrite.git
synced 2024-12-23 08:44:11 +00:00
161f145176
* Add NATS JetStream support Update shopify/sarama * Fix addresses * Don't change Addresses in Defaults * Update saramajetstream * Add missing error check Keep typing events for at least one minute * Use all configured NATS addresses * Update saramajetstream * Try setting up with NATS * Make sure NATS uses own persistent directory (TODO: make this configurable) * Update go.mod/go.sum * Jetstream package * Various other refactoring * Build fixes * Config tweaks, make random jetstream storage path for CI * Disable interest policies * Try to sane default on jetstream base path * Try to use in-memory for CI * Restore storage/retention * Update nats.go dependency * Adapt changes to config * Remove unneeded TopicFor * Dep update * Revert "Remove unneeded TopicFor" This reverts commit f5a4e4a339b6f94ec215778dca22204adaa893d1. * Revert changes made to streams * Fix build problems * Update nats-server * Update go.mod/go.sum * Roomserver input API queuing using NATS * Fix topic naming * Prometheus metrics * More refactoring to remove saramajetstream * Add missing topic * Don't try to populate map that doesn't exist * Roomserver output topic * Update go.mod/go.sum * Message acknowledgements * Ack tweaks * Try to resume transaction re-sends * Try to resume transaction re-sends * Update to matrix-org/gomatrixserverlib@91dadfb * Remove internal.PartitionStorer from components that don't consume keychanges * Try to reduce re-allocations a bit in resolveConflictsV2 * Tweak delivery options on RS input * Publish send-to-device messages into correct JetStream subject * Async and sync roomserver input * Update dendrite-config.yaml * Remove roomserver tests for now (they need rewriting) * Remove roomserver test again (was merged back in) * Update documentation * Docker updates * More Docker updates * Update Docker readme again * Fix lint issues * Send final event in `processEvent` synchronously (since this might stop Sytest from being so upset) * Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that * Go 1.16 instead of Go 1.13 for upgrade tests and Complement * Revert "Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that" This reverts commit 368675283fc44501f227639811bdb16dd5deef8c. * Don't report any errors on `/send` to see what fun that creates * Fix panics on closed channel sends * Enforce state key matches sender * Do the same for leave * Various tweaks to make tests happier Squashed commit of the following: commit 13f9028e7a63662759ce7c55504a9d2423058668 Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:47:14 2022 +0000 Do the same for leave commit e6be7f05c349fafbdddfe818337a17a60c867be1 Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:33:42 2022 +0000 Enforce state key matches sender commit 85ede6d64bf10ce9b91cdd6d80f87350ee55242f Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 14:07:04 2022 +0000 Fix panics on closed channel sends commit 9755494a98bed62450f8001d8128e40481d27e15 Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 13:38:22 2022 +0000 Don't report any errors on `/send` to see what fun that creates commit 3bb4f87b5dd56882febb4db5621db484c8789b7c Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 13:00:26 2022 +0000 Revert "Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that" This reverts commit 368675283fc44501f227639811bdb16dd5deef8c. commit fe2673ed7be9559eaca134424e403a4faca100b0 Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 12:09:34 2022 +0000 Go 1.16 instead of Go 1.13 for upgrade tests and Complement commit 368675283fc44501f227639811bdb16dd5deef8c Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 11:51:45 2022 +0000 Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that commit b028dfc08577bcf52e6cb498026e15fa5d46d07c Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 10:29:08 2022 +0000 Send final event in `processEvent` synchronously (since this might stop Sytest from being so upset) * Merge in NATS Server v2.6.6 and nats.go v1.13 into the in-process connection fork * Add `jetstream.WithJetStreamMessage` to make ack/nak-ing less messy, use process context in consumers * Fix consumer component name in federation API * Add comment explaining where streams are defined * Tweaks to roomserver input with comments * Finish that sentence that I apparently forgot to finish in INSTALL.md * Bump version number of config to 2 * Add comments around asynchronous sends to roomserver in processEventWithMissingState * More useful error message when the config version does not match * Set version in generate-config * Fix version in config.Defaults Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
156 lines
3.4 KiB
YAML
156 lines
3.4 KiB
YAML
version: "3.4"
|
|
services:
|
|
postgres:
|
|
hostname: postgres
|
|
image: postgres:14
|
|
restart: always
|
|
volumes:
|
|
- ./postgres/create_db.sh:/docker-entrypoint-initdb.d/20-create_db.sh
|
|
# To persist your PostgreSQL databases outside of the Docker image,
|
|
# to prevent data loss, modify the following ./path_to path:
|
|
- ./path_to/postgresql:/var/lib/postgresql/data
|
|
environment:
|
|
POSTGRES_PASSWORD: itsasecret
|
|
POSTGRES_USER: dendrite
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "pg_isready -U dendrite"]
|
|
interval: 5s
|
|
timeout: 5s
|
|
retries: 5
|
|
networks:
|
|
- internal
|
|
|
|
jetstream:
|
|
hostname: jetstream
|
|
image: nats:latest
|
|
command: |
|
|
--jetstream
|
|
--store_dir /var/lib/nats
|
|
--cluster_name Dendrite
|
|
volumes:
|
|
# To persist your NATS JetStream streams outside of the Docker image,
|
|
# prevent data loss, modify the following ./path_to path:
|
|
- ./path_to/nats:/var/lib/nats
|
|
networks:
|
|
- internal
|
|
|
|
client_api:
|
|
hostname: client_api
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: clientapi
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
depends_on:
|
|
- jetstream
|
|
- postgres
|
|
networks:
|
|
- internal
|
|
restart: unless-stopped
|
|
|
|
media_api:
|
|
hostname: media_api
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: mediaapi
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
- ./media:/var/dendrite/media
|
|
networks:
|
|
- internal
|
|
restart: unless-stopped
|
|
|
|
sync_api:
|
|
hostname: sync_api
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: syncapi
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
depends_on:
|
|
- jetstream
|
|
- postgres
|
|
networks:
|
|
- internal
|
|
restart: unless-stopped
|
|
|
|
room_server:
|
|
hostname: room_server
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: roomserver
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
depends_on:
|
|
- jetstream
|
|
- postgres
|
|
networks:
|
|
- internal
|
|
restart: unless-stopped
|
|
|
|
edu_server:
|
|
hostname: edu_server
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: eduserver
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
depends_on:
|
|
- jetstream
|
|
networks:
|
|
- internal
|
|
restart: unless-stopped
|
|
|
|
federation_api:
|
|
hostname: federation_api
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: federationapi
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
depends_on:
|
|
- jetstream
|
|
- postgres
|
|
networks:
|
|
- internal
|
|
restart: unless-stopped
|
|
|
|
key_server:
|
|
hostname: key_server
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: keyserver
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
depends_on:
|
|
- jetstream
|
|
- postgres
|
|
networks:
|
|
- internal
|
|
restart: unless-stopped
|
|
|
|
user_api:
|
|
hostname: user_api
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: userapi
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
depends_on:
|
|
- jetstream
|
|
- postgres
|
|
networks:
|
|
- internal
|
|
restart: unless-stopped
|
|
|
|
appservice_api:
|
|
hostname: appservice_api
|
|
image: matrixdotorg/dendrite-polylith:latest
|
|
command: appservice
|
|
volumes:
|
|
- ./config:/etc/dendrite
|
|
networks:
|
|
- internal
|
|
depends_on:
|
|
- jetstream
|
|
- postgres
|
|
- room_server
|
|
- user_api
|
|
restart: unless-stopped
|
|
|
|
networks:
|
|
internal:
|
|
attachable: true
|