12 commits

Author	SHA1	Message	Date
Timo Kösters	9c3f1a9272	Merge branch 'master' into 'master' ... Add Traefik setup, incl. step-by-step, to docker README. See merge request famedly/conduit!158	2021-09-01 16:04:41 +00:00
Jonathan de Jong	9ec8b7f2b3	registration default true	2021-08-31 18:25:35 +02:00
Daniel Wiesenberg	5800e9b797	Add Traefik setup, incl. step-by-step, to docker README.	2021-08-26 12:26:32 +02:00
Daniel Wiesenberg	a7b6af7caf	Bump version of alpine docker image to 3.14	2021-08-09 21:21:18 +02:00
Daniel Wiesenberg	6a96cfaac1	Change default port in docker to the new ... conduit default port 6167 and fix the docker healthcheck	2021-07-06 10:43:33 +02:00
Daniel Wiesenberg	8387ceacab	Fix docker-compose trusted_servers env var	2021-05-25 21:34:31 +02:00
Daniel Wiesenberg	634fe04c33	Fix wrong env var name in traefik compose	2021-05-22 20:49:07 +02:00
Daniel Wiesenberg	c6625d83e6	Add CONDUIT_TRUSTED_SERVERS config param	2021-05-22 16:53:48 +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	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	38ac3e42be	Docker add healthcheck and mention Docker Hub image	2020-08-25 09:02:45 +02:00
Daniel Wiesenberg	7288010e55	Move additional files into dedicated folder and make build the def... ... ...fault in the compose files.	2020-08-11 15:38:24 +02:00

Renamed from docker-compose.traefik.yml (Browse further)