mirror of
https://github.com/matrix-org/mjolnir.git
synced 2024-06-25 22:22:26 +00:00
50f80f2392
Mjolnir can now be run as an application service, meaning it will host multiple independent mjolnirs that can be requested by users. If the user is on the same homeserver as the appservice is deployed on, then they can provision a mjolnir via a widget https://github.com/matrix-org/mjolnir-widget. Otherwise they can invite the appservice bot to a room they want to protect. This will create them a mjolnir, a management room and a policy list. The appservice shares the same docker image as the bot, but is started slightly differently by specifying "appservice" as the first argument to docker run (this s managed by `mjolnir-entrypoint.sh`. We could have used another Dockerfile for the appservice, extending the existing one but we decided not to because there would have been lots of fiddling around the entrypoint and logistics involved around adding a tag for it via github actions. Not to mention that this would be duplicating the image just to run it with a different binary. A list of followup issues can be found here https://github.com/issues?q=is%3Aopen+is%3Aissue+author%3AGnuxie+archived%3Afalse+label%3AA-Appservice. Somewhat relevant and squashed commit messages(regrettably squashing because frankly these won't make sense in isolation): * draft widget backend * add `managementRoomId` to `provisionNewMjolnir` * remove ratelimits from appservice mjolnirs * add /join endpoint to api backend * tighter guard around room type in PolicyList matrix-bot-sdk imporved the types for this * enable esModuleInterop * launch and use postgres in a container whilst using mx-tester * limited access control policy list used for access control * Redesign initialization API of many mjolnir. It's much harder to forget to initialize the components now that you have to in order to construct them in the first place. * Ammend config not to clash with existing CI this means that the appsrvice bot is now called 'mjolnir-bot' by default which was easier than going through old code base and renaming * Change entrypoint in Dockerfile so that we can start the appservice. We could have used another Dockerfile for the appservice, extending the exising one but we decided not to because there would have been lots of fiddling around the entrypoint and logistics involved around adding a tag for it via github actions. Not to mention that this would be duplicating the image just to run it with a different binary. This solution is much simpler, backwards compatible, and conscious about the future. Co-authored-by: gnuxie <gnuxie@element.io>
15 lines
777 B
Bash
Executable File
15 lines
777 B
Bash
Executable File
#!/bin/sh
|
|
|
|
# This is used as the entrypoint in the mjolnir Dockerfile.
|
|
# We want to transition away form people running the image without specifying `bot` or `appservice`.
|
|
# So if eventually cli arguments are provided for the bot version, we want this to be the opportunity to move to `bot`.
|
|
# Therefore using arguments without specifying `bot` (or appservice) is unsupported.
|
|
# We maintain the behaviour where if it looks like someone is providing an executable to `docker run`, then we will execute that instead.
|
|
# This aids configuration and debugging of the image if for example node needed to be started via another method.
|
|
case "$1" in
|
|
bot) shift; set -- node /mjolnir/index.js "$@";;
|
|
appservice) shift; set -- node /mjolnir/appservice/cli.js "$@";;
|
|
esac
|
|
|
|
exec "$@";
|