Commit Graph

24 Commits (f2ef5677e0f016399dce4da66d45137e2e592e8c)

Author SHA1 Message Date
Daniel Wiesenberg bbe36810ec Fix deprecated/removed Traefik label 3 years ago
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
3 years ago
Timo Kösters 22779c21d3 Merge branch 'health_script' into 'master'
Fix healthcheck.sh permissions and rearange ci dockerfile

See merge request famedly/conduit!179
3 years ago
Daniel Wiesenberg 8c584887c9 Fix healthcheck.sh permissions and rearange ci dockerfile 3 years ago
Timo Kösters 364820aae4 Merge branch 'registration-default' into 'master'
Default registration true

See merge request famedly/conduit!176
3 years ago
Jonathan de Jong 9ec8b7f2b3 registration default true 3 years ago
Daniel Wiesenberg 9ded40e983 Change healthcheck in ci dockerfile 3 years ago
Daniel Wiesenberg a469ca0461 Move docker healthcheck into dedicated script. 3 years ago
Daniel Wiesenberg 5800e9b797 Add Traefik setup, incl. step-by-step, to docker README. 3 years ago
Daniel Wiesenberg a7b6af7caf Bump version of alpine docker image to 3.14 3 years ago
Jonas Zohren 167e903a56 Fix typo 3 years ago
Jonas Zohren 678ce0abc6 CI: Create docker image with musl binary 3 years ago
Daniel Wiesenberg 6a96cfaac1 Change default port in docker to the new
conduit default port 6167 and fix the docker healthcheck
3 years ago
Daniel Wiesenberg 8387ceacab Fix docker-compose trusted_servers env var 3 years ago
Daniel Wiesenberg 634fe04c33 Fix wrong env var name in traefik compose 3 years ago
Daniel Wiesenberg c6625d83e6 Add CONDUIT_TRUSTED_SERVERS config param 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
Daniel Wiesenberg 7288010e55 Move additional files into dedicated folder and make build the def...
...fault in the compose files.
4 years ago