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
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
Moritz Heiber
cfcc9086ff
Add a dynamic address resolution to the Docker healthcheck
2023-01-27 22:43:04 +00: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
e03a2b8636
chore(docker): Bump base image to alpine 3.16.0
2022-06-18 11:05:42 +00:00
Jonas Zohren
1ebf417c11
chore: Bump alpine version for CI generated docker
2022-03-30 20:23:04 +00:00
Jonas Zohren
61277452af
chore(docker): Bump alpine (base image) version
2022-03-18 18:44:05 +01:00
Jonas Zohren
a5bb6786c8
fix(docker): Make conduit own default db path
...
When a user mounts a volume into the default volume path,
it uses the permissions and ownership from the host volume.
In most cases, this is 1000:1000, which it also uses on the inside.
If you don't mount a volume though (e.g., for testing), conduit cries:
“The database couldn't be loaded or created.”
This fix chowns the default db dir to remedy this.
2022-02-22 16:26:30 +01: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
b4225cb0fc
fix(docker): use user 1000 and standard db path
2022-02-16 15:13:04 +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 Platte
1f7b3fa4ac
Port from Rocket to axum
2022-02-12 12:56:07 +01:00
Jonas Zohren
103dc7e09b
Pre-0.3 doc adjustments
2022-02-04 18:05:24 +01:00
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
