Jonas Zohren
e5bac5e4f5
fix: Running in Docker
2022-02-02 14:07:35 +01:00
Jonas Zohren
9478c75f9d
Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers
...
Also run all builds on approved MRs
2022-02-02 13:31:28 +01:00
Jonas Zohren
401b88d16d
fix: Healtcheck use netstat for port as fallback
2022-01-28 23:23:58 +01:00
Jonas Zohren
44f7a85077
fix: Use default port for healthcheck as fallback
...
Conduit can start without a specific port being configured.
This adjusts the healthcheck script to tolerate that state.
Closes https://gitlab.com/famedly/conduit/-/issues/222
2022-01-28 22:33:49 +01:00
Maxim De Clercq
c7560b3502
fix: remove libgcc dependency in ci builds since the binary is ensured to be statically compiled
2022-01-23 18:09:14 +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
339a26f56c
Update docker images
2021-12-15 10:14:20 +00:00
Jonas Zohren
9bfc7b34b6
Fixes for !225
2021-11-25 22:36:44 +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
bbe36810ec
Fix deprecated/removed Traefik label
2021-09-03 21:51:17 +02:00
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
Timo Kösters
22779c21d3
Merge branch 'health_script' into 'master'
...
Fix healthcheck.sh permissions and rearange ci dockerfile
See merge request famedly/conduit!179
2021-09-01 08:08:22 +00:00
Daniel Wiesenberg
8c584887c9
Fix healthcheck.sh permissions and rearange ci dockerfile
2021-08-31 23:17:32 +02:00
Timo Kösters
364820aae4
Merge branch 'registration-default' into 'master'
...
Default registration true
See merge request famedly/conduit!176
2021-08-31 17:03:05 +00:00
Jonathan de Jong
9ec8b7f2b3
registration default true
2021-08-31 18:25:35 +02:00
Daniel Wiesenberg
9ded40e983
Change healthcheck in ci dockerfile
2021-08-30 09:14:08 +02:00
Daniel Wiesenberg
a469ca0461
Move docker healthcheck into dedicated script.
2021-08-29 20:01:38 +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
Jonas Zohren
167e903a56
Fix typo
2021-07-19 22:02:10 +02:00
Jonas Zohren
678ce0abc6
CI: Create docker image with musl binary
2021-07-19 20:39:58 +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
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
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
