Luke McCarthy
9b3664aeeb
Update README.md to fix typo & fix compatibility with new versions of docker compose
2023-08-27 02:14:03 +00:00
Jonas Zohren
90fea00dc7
Merge branch 'docs-docker-coturn' into 'next'
...
Docs: coturn instructions for docker
See merge request famedly/conduit!498
2023-08-23 14:18:42 +00:00
Jonas Zohren
20924a44f1
Suggestion on how to generate a secure key
2023-08-23 11:17:47 +02:00
purplemeteorite
38d6426b0e
coturn setup instructions for docker
2023-08-23 11:09:21 +02:00
purplemeteorite
c0a2acb869
Merge branch 'next' into 'fix-broken-links'
...
# Conflicts resolved:
# docker/README.md
2023-07-29 08:02:56 +00:00
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
2023-07-29 07:13:58 +00:00
purplemeteorite
081cc66eda
fixed broken traefik links in docker README
2023-07-29 08:26:34 +02:00
uak
54a115caf3
Change link from docker-compose.override.traefik.yml to docker-compose.override.yml in README.md
2023-07-26 18:53:19 +00:00
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.
2023-07-21 20:33:32 +02:00
Jonas Zohren
17180a3e08
capitalize names
2023-07-13 16:54:56 +00:00
purplemeteorite
06a1321e56
easier-to-read docker setup instructions
2023-06-28 18:51:44 +02:00
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.
2022-11-08 15:56:24 +00:00
exin
98702da4e6
Lower default log level for docker
2022-10-13 13:11:15 +02:00
Jonas Zohren
86162c2c20
Merge branch 'next' into docs
2022-02-20 11:43:50 +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
0be8500c4f
Set all env vars in docker README
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
103dc7e09b
Pre-0.3 doc adjustments
2022-02-04 18:05:24 +01:00
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.
2022-01-07 13:06:21 +00:00
Jonas Zohren
2fff720df3
CI: New Multiarch builds and Docker images + cargo clippy/test output now integrated into GitLab
2021-11-21 17:34:08 +00:00
Daniel Wiesenberg
5800e9b797
Add Traefik setup, incl. step-by-step, to docker README.
2021-08-26 12:26:32 +02:00
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.
2021-05-22 16:53:48 +02:00
Daniel Wiesenberg
beb428d866
Update docker command in README
...
Mention the need for a config.
2021-05-22 16:53:48 +02:00
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
2021-05-22 16:53:48 +02:00
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.
2020-10-18 23:06:08 +02:00
Daniel Wiesenberg
38ac3e42be
Docker add healthcheck and mention Docker Hub image
2020-08-25 09:02:45 +02:00
Timo
2fc99c05e1
docs: add documentation to the repo and improve layout
2020-08-12 21:17:53 +02:00
Daniel Wiesenberg
87ed132ae4
Add README in docker folder and mention docker in Conduit's README
2020-08-11 15:38:24 +02:00