Commit graph

1404 commits

Author SHA1 Message Date
Jonas Zohren
6788225cac Merge branch 'fix-docker-db-dir-permissions' into 'next'
Fix(docker): Make conduit own default db path

See merge request famedly/conduit!320
2022-02-22 15:34:14 +00:00
Jonas Zohren
a5bb6786c8
fix(docker): Make conduit own default db path
When a user mounts a volume into the default volume path,
it uses the permissions and ownership from the host volume.
In most cases, this is 1000:1000, which it also uses on the inside.

If you don't mount a volume though (e.g., for testing), conduit cries:
“The database couldn't be loaded or created.”

This fix chowns the default db dir to remedy this.
2022-02-22 16:26:30 +01:00
Jonas Zohren
237645e975 Merge branch 'docs' into 'next'
docs: make all configs match

Closes #205

See merge request famedly/conduit!301
2022-02-20 10:59:56 +00:00
Jonas Zohren
86162c2c20
Merge branch 'next' into docs 2022-02-20 11:43:50 +01:00
Jonas Zohren
199c84195a Merge branch 'improve-docker-documentation' into 'next'
Improve docker documentation some

See merge request famedly/conduit!314
2022-02-20 10:43:05 +00:00
Jonas Zohren
57ac4160b7
Merge branch 'next' into docs 2022-02-20 11:42:19 +01:00
Jonas Zohren
91c648253a Merge branch 'docs-remove-obsolete-cross-readme' into 'next'
Remove the now obsolete cross readme

See merge request famedly/conduit!315
2022-02-20 10:22:47 +00:00
Jonas Zohren
5a80507006
chore(docs): Remove the now obsolete cross readme 2022-02-20 11:12:49 +01:00
Jonathan de Jong
cc14727888 revert reflow 2022-02-20 10:55:17 +01:00
Jonathan de Jong
94573a3a61 improve docker documentation some 2022-02-19 17:06:06 +01:00
Jonas Zohren
0ba0fa5f6c Merge branch 'ci-audit-dependencies' into 'next'
CI: audit dependencies

See merge request famedly/conduit!313
2022-02-19 11:25:30 +00:00
Jonas Zohren
ad6eb92bbd
feat(ci): Add dependency audit to CI tests 2022-02-19 12:19:06 +01:00
Timo Kösters
ce76041c03 Merge branch 'up-ruma' into 'next'
Update Ruma

See merge request famedly/conduit!312
2022-02-19 09:46:56 +00:00
Jonas Zohren
8f063c99d5
chore(ci): Split up tests 2022-02-18 22:29:55 +01:00
Jonathan de Jong
557d119bee change search_events_v3 to search_events::v3 2022-02-18 19:54:26 +01:00
Jonathan de Jong
e9f87e1952 update ruma 2022-02-18 15:33:14 +01:00
Jonas Zohren
f3795846b5 Merge branch 'readme' into 'next'
Slight clarification

See merge request famedly/conduit!310
2022-02-18 12:19:51 +00:00
Timo Kösters
b8eaa3be85 Merge branch 'redactfix' into 'next'
Redaction fix

Closes #235

See merge request famedly/conduit!298
2022-02-18 12:00:40 +00:00
Timo Kösters
c496e599ef Merge branch 'serde-cleanup' into 'next'
Remove useless serde roundtrips

See merge request famedly/conduit!311
2022-02-18 11:07:59 +00:00
Jonas Platte
27692a2f14
Remove useless serde roundtrips 2022-02-18 11:52:00 +01:00
TomZ
e57cd437d4 Slight clarification
Which version it started being beta in is quite irrelevant here.
2022-02-17 23:00:39 +01:00
Timo Kösters
5a99460a4c Merge branch 'not-found' into 'next'
Add a not-found route

See merge request famedly/conduit!306
2022-02-17 15:43:08 +00:00
Jonas Zohren
ba83d0ac68 Merge branch 'more-vscode-defaults' into 'next'
Provide some sane defaults for vscode developing

See merge request famedly/conduit!309
2022-02-17 15:33:03 +00:00
Jonas Zohren
bcd6c0bf53 feat: Provide sane defaults for vscode developing
This includes some extensions and a debug profile
2022-02-17 11:14:50 +00:00
Jonas Zohren
b4225cb0fc
fix(docker): use user 1000 and standard db path 2022-02-16 15:13:04 +01:00
Jonas Zohren
98b67da649
fix: Docker syntax 2022-02-16 15:13:03 +01:00
Jonas Zohren
0be8500c4f
Set all env vars in docker README 2022-02-16 15:12:40 +01:00
Jonas Zohren
97507d2880
Remove most env vars from Dockerfile 2022-02-16 15:12:40 +01:00
Jonas Zohren
c4353405a5
Suggestions from Jonas Zohren 2022-02-16 15:12:38 +01:00
Timo Kösters
de6c3312ce
docs: make all configs match 2022-02-16 15:11:46 +01:00
Jonas Zohren
c66866d890 Merge branch 'ci-lint-dockerfiles-with-hadolint' into 'next'
CI: Lint dockerfiles with hadolint

Closes #239

See merge request famedly/conduit!308
2022-02-15 19:10:12 +00:00
Jonas Zohren
b21a44ca4c
feat(ci): Lint dockerfiles with hadolint 2022-02-15 20:01:38 +01:00
Jonas Zohren
e04d4ff150 Merge branch 'ci-fix-tag-pipelines' into 'next'
Ci fix tag pipelines

Closes #229

See merge request famedly/conduit!307
2022-02-15 10:56:25 +00:00
Jonas Zohren
2645494582
fix(ci): Also run CI for git tags 2022-02-15 11:17:46 +01:00
Jonas Zohren
77f4b68c8e
fix(ci): Also create versioned docker image 2022-02-15 11:17:32 +01:00
Timo Kösters
6602f6114c
fix: redacts can't error anymore 2022-02-13 15:47:58 +01:00
Jonas Platte
3aece38e9d
Add a not-found route 2022-02-13 13:59:27 +01:00
Timo Kösters
9cfef51af3 Merge branch 'more-paths' into 'next'
Take advantage of multiple paths

See merge request famedly/conduit!305
2022-02-13 12:13:22 +00:00
Jonas Platte
aee6bf7e7a Change this to handler 2022-02-13 11:30:04 +00:00
Jonathan de Jong
b8d92d3cec take advantage of multiple paths 2022-02-13 12:07:00 +01:00
Timo Kösters
0c4b42ac13 Merge branch 'parse-pdu-command-panic' into 'next'
fix: do not panic on a JSON not containing the PDU

Closes #236

See merge request famedly/conduit!304
2022-02-12 21:22:37 +00:00
Timo Kösters
91d5fbd56c Merge branch 'up-ruma' into 'next'
Update ruma

See merge request famedly/conduit!303
2022-02-12 20:59:07 +00:00
M0dEx
d4217007fe
fix: do not panic on a JSON not containing the PDU
Do not panic on a JSON not containing the PDU when executing the parse-pdu admin command.
2022-02-12 21:40:07 +01:00
Jonathan de Jong
35b82d51cf fix compilations 2022-02-12 21:04:38 +01:00
Jonathan de Jong
0ed1e42aed update ruma 2022-02-12 21:01:53 +01:00
Timo Kösters
2b644ef7b7 Merge branch 'tracing-cleanup' into 'next'
Remove unnecessary tracing::instrument attributes

See merge request famedly/conduit!302
2022-02-12 15:50:24 +00:00
Jonas Platte
0ad6eac4f8
Remove all tracing::instrument attributes from database::abstraction::* 2022-02-12 16:38:47 +01:00
Jonas Platte
accdb77315
Clean up tracing::instrument attributes
Remove it from request handler since there's already the context of the
request path, added through TraceLayer.
2022-02-12 16:38:47 +01:00
Timo Kösters
914152fcbd Merge branch 'syncfast' into 'next'
improvement: faster /syncs

Closes #231

See merge request famedly/conduit!297
2022-02-12 15:11:03 +00:00
Timo Kösters
2a00c547a1
improvement: faster /syncs 2022-02-12 15:57:54 +01:00