Commit Graph

46 Commits (f47a5cd5d5ce20b5996d28e37415771ee6d8a34b)

Author SHA1 Message Date
Jonas Zohren e03a2b8636 chore(docker): Bump base image to alpine 3.16.0 2 years ago
Jonas Zohren 1ebf417c11 chore: Bump alpine version for CI generated docker 2 years ago
Jonas Zohren 61277452af
chore(docker): Bump alpine (base image) version 2 years ago
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.
2 years ago
Jonas Zohren 86162c2c20
Merge branch 'next' into docs 2 years ago
Jonathan de Jong cc14727888 revert reflow 2 years ago
Jonathan de Jong 94573a3a61 improve docker documentation some 2 years ago
Jonas Zohren b4225cb0fc
fix(docker): use user 1000 and standard db path 2 years ago
Jonas Zohren 0be8500c4f
Set all env vars in docker README 2 years ago
Jonas Zohren c4353405a5
Suggestions from Jonas Zohren 2 years ago
Timo Kösters de6c3312ce
docs: make all configs match 2 years ago
Jonas Platte 1f7b3fa4ac
Port from Rocket to axum 2 years ago
Jonas Zohren 103dc7e09b
Pre-0.3 doc adjustments 2 years ago
Jonas Zohren e5bac5e4f5
fix: Running in Docker 2 years ago
Jonas Zohren 9478c75f9d
Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers
Also run all builds on approved MRs
2 years ago
Jonas Zohren 401b88d16d
fix: Healtcheck use netstat for port as fallback 2 years ago
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
2 years ago
Maxim De Clercq c7560b3502
fix: remove libgcc dependency in ci builds since the binary is ensured to be statically compiled 2 years ago
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.
3 years ago
Jonas Zohren 339a26f56c Update docker images 3 years ago
Jonas Zohren 9bfc7b34b6 Fixes for !225 3 years ago
Jonas Zohren 2fff720df3 CI: New Multiarch builds and Docker images + cargo clippy/test output now integrated into GitLab 3 years ago
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