shruub
/
conduit
mirror of https://gitlab.com/famedly/conduit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,047 Commits
48 Branches
7 Tags
20 MiB
restricted-make-send-join
next
master
make-send-leave
error-parse-image-thumbnail
update-device-seen-on-usage
presence
chore/format-nix
all-the-lints
generate-config
push-federation-invites-to-appservices
unstable-msc4125
jonas-test-ci-docker-building-quemu-on-fsinfo-runner
askstate
recoverbroken
Nyaaori/temp-combined-feature-branch
Nyaaori/destructive-rocksdb-recovery
Nyaaori/full-profile-directory
Nyaaori/read-receipt-config-options
Nyaaori/private-read-receipts
Nyaaori/federation-backfill
Nyaaori/declare-msc3827
Nyaaori/remove-misisng-e2ee-readme
Nyaaori/refactor-next
refactor-ci-fix
bump-docker-alpine-to-3.16.2
jplatte/up-ruma
mdbook-docs-preparation
async
complement-integration
brokenjoinfix
state_full_ids_cache
ticho34782694/conduit-rocksdb-memory-usage
docs-the-second
serve-element-web
perf
nyaaori/older-room-versions
unbeatable-101-next-patch-64009
docs-overhaul
state-res-perf
stablecrosssigning
member-reason
admin-command-for-cache-memory-usage
measure-cache-memory-usage
lesscache
locks
state-res-closure-rebased
ruma-client
v0.2.0
v0.3.0
v0.4.0
v0.5.0
v0.6.0
v0.7.0
v0.8.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '5cc53c9e14'
${ noResults }
Commit Graph

30 Commits (5cc53c9e14ef5319f2dd8f88aa58d6e966cfdb20)

Author SHA1 Message Date
Luke McCarthy 9b3664aeeb Update README.md to fix typo & fix compatibility with new versions of docker compose 10 months ago
Jonas Zohren 90fea00dc7 Merge branch 'docs-docker-coturn' into 'next' 
Docs: coturn instructions for docker

See merge request famedly/conduit!498
 10 months ago
Jonas Zohren 20924a44f1 Suggestion on how to generate a secure key 10 months ago
purplemeteorite 38d6426b0e coturn setup instructions for docker 10 months ago
purplemeteorite c0a2acb869 Merge branch 'next' into 'fix-broken-links' 
# Conflicts resolved:
#   docker/README.md
 11 months ago
Timo Kösters 97835541ce Merge branch 'uak-next-patch-77212' into 'next' 
Change link from docker-compose.override.traefik.yml to docker-compose.override.yml in README.md

See merge request famedly/conduit!514
 11 months ago
purplemeteorite 081cc66eda fixed broken traefik links in docker README 11 months ago
uak 54a115caf3 Change link from docker-compose.override.traefik.yml to docker-compose.override.yml in README.md 11 months ago
purplemeteorite bd8fec3836 changed registry options 
1. Recommended GitLab's own registry over Docker Hub. (Reason: https://gitlab.com/famedly/conduit/-/merge_requests/492#note_1457220261)
2. Added the development image :next to the list of options.
3. Displayed text for Docker Hub now contains "docker.io" as part of the link for easier copy-paste for podman users. Clicking on the link still takes to the website.
 12 months ago
Jonas Zohren 17180a3e08 capitalize names 12 months ago
purplemeteorite 06a1321e56 easier-to-read docker setup instructions 1 year ago
Ticho 34782694 09015f113c Describe a better way to enforce Content-Type in nginx 
add_header will not override the Content-Type header set by the server,
but will instead add another header below, which is obviously not ideal.

The proposed change will instead tell nginx to set the correct value for
this header straight away.
 2 years ago
exin 98702da4e6
Lower default log level for docker 2 years ago
Jonas Zohren 86162c2c20
Merge branch 'next' into docs 2 years ago
Jonathan de Jong cc14727888 revert reflow 2 years ago
Jonathan de Jong 94573a3a61 improve docker documentation some 2 years ago
Jonas Zohren 0be8500c4f
Set all env vars in docker README 2 years ago
Jonas Zohren c4353405a5
Suggestions from Jonas Zohren 2 years ago
Timo Kösters de6c3312ce
docs: make all configs match 2 years ago
Jonas Zohren 103dc7e09b
Pre-0.3 doc adjustments 2 years ago
Ticho 34782694 b746f17e56 Make traefik+nginx config more self-contained 
The nginx instance which is serving the .well-known endpoints can serve
the simple JSON replies directly from memory, instead of having them
as external files on disk.
 3 years ago
Jonas Zohren 2fff720df3 CI: New Multiarch builds and Docker images + cargo clippy/test output now integrated into GitLab 3 years ago
Daniel Wiesenberg 5800e9b797 Add Traefik setup, incl. step-by-step, to docker README. 3 years ago
Daniel Wiesenberg 5a7ccbdfab Add CONDUIT_CONFIG to all relevant docker files 
And mention that an empty string can be used to configure
Conduit purely with env vars.
 3 years ago
Daniel Wiesenberg beb428d866 Update docker command in README 
Mention the need for a config.
 3 years ago
Daniel Wiesenberg 52a96b3d84 Update Dockerfile and docker-compose 
- Dockerfile now tracks the gitlab repository and the master branch.
- docker-compose now points to conduit.toml instead of Rocket.toml and
its env vars were also renamed from ROCKET_ to CONDUIT_.
Furthermore vectorim/riot-web was changed to vectorim/element-web
 3 years ago
Daniel Wiesenberg 2d6b7750fd Fix order of docker command arguments and change repository link to... 
...github.com repo, to relieve some pressure from git.koesters.xyz.
 4 years ago
Daniel Wiesenberg 38ac3e42be Docker add healthcheck and mention Docker Hub image 4 years ago
Timo 2fc99c05e1
docs: add documentation to the repo and improve layout 4 years ago
Daniel Wiesenberg 87ed132ae4 Add README in docker folder and mention docker in Conduit's README 4 years ago