summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)Author
2023-07-29Merge branch 'uak-next-patch-77212' into 'next'Timo Kösters
Change link from docker-compose.override.traefik.yml to docker-compose.override.yml in README.md See merge request famedly/conduit!514
2023-07-26Change link from docker-compose.override.traefik.yml to ↵uak
docker-compose.override.yml in README.md
2023-07-21changed registry optionspurplemeteorite
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-13capitalize namesJonas Zohren
2023-06-28easier-to-read docker setup instructionspurplemeteorite
2023-01-27Add a dynamic address resolution to the Docker healthcheckMoritz Heiber
2022-11-08Describe a better way to enforce Content-Type in nginxTicho 34782694
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-10-13Lower default log level for dockerexin
2022-06-18chore(docker): Bump base image to alpine 3.16.0Jonas Zohren
2022-03-30chore: Bump alpine version for CI generated dockerJonas Zohren
2022-03-18chore(docker): Bump alpine (base image) versionJonas Zohren
2022-02-22fix(docker): Make conduit own default db pathJonas Zohren
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-20Merge branch 'next' into docsJonas Zohren
2022-02-20revert reflowJonathan de Jong
2022-02-19improve docker documentation someJonathan de Jong
2022-02-16fix(docker): use user 1000 and standard db pathJonas Zohren
2022-02-16Set all env vars in docker READMEJonas Zohren
2022-02-16Suggestions from Jonas ZohrenJonas Zohren
2022-02-16docs: make all configs matchTimo Kösters
2022-02-12Port from Rocket to axumJonas Platte
2022-02-04Pre-0.3 doc adjustmentsJonas Zohren
2022-02-02fix: Running in DockerJonas Zohren
2022-02-02Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containersJonas Zohren
Also run all builds on approved MRs
2022-01-28fix: Healtcheck use netstat for port as fallbackJonas Zohren
2022-01-28fix: Use default port for healthcheck as fallbackJonas Zohren
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-23fix: remove libgcc dependency in ci builds since the binary is ensured to be ↵Maxim De Clercq
statically compiled
2022-01-07Make traefik+nginx config more self-containedTicho 34782694
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.
2021-12-15Update docker imagesJonas Zohren
2021-11-25Fixes for !225Jonas Zohren
2021-11-21CI: New Multiarch builds and Docker images + cargo clippy/test output now ↵Jonas Zohren
integrated into GitLab
2021-09-03Fix deprecated/removed Traefik labelDaniel Wiesenberg
2021-09-01Merge branch 'master' into 'master'Timo Kösters
Add Traefik setup, incl. step-by-step, to docker README. See merge request famedly/conduit!158
2021-09-01Merge branch 'health_script' into 'master'Timo Kösters
Fix healthcheck.sh permissions and rearange ci dockerfile See merge request famedly/conduit!179
2021-08-31Fix healthcheck.sh permissions and rearange ci dockerfileDaniel Wiesenberg
2021-08-31Merge branch 'registration-default' into 'master'Timo Kösters
Default registration true See merge request famedly/conduit!176
2021-08-31registration default trueJonathan de Jong
2021-08-30Change healthcheck in ci dockerfileDaniel Wiesenberg
2021-08-29Move docker healthcheck into dedicated script.Daniel Wiesenberg
2021-08-26Add Traefik setup, incl. step-by-step, to docker README.Daniel Wiesenberg
2021-08-09Bump version of alpine docker image to 3.14Daniel Wiesenberg
2021-07-19Fix typoJonas Zohren
2021-07-19CI: Create docker image with musl binaryJonas Zohren
2021-07-06Change default port in docker to the newDaniel Wiesenberg
conduit default port 6167 and fix the docker healthcheck
2021-05-25Fix docker-compose trusted_servers env varDaniel Wiesenberg
2021-05-22Fix wrong env var name in traefik composeDaniel Wiesenberg
2021-05-22Add CONDUIT_TRUSTED_SERVERS config paramDaniel Wiesenberg
2021-05-22Add CONDUIT_CONFIG to all relevant docker filesDaniel Wiesenberg
And mention that an empty string can be used to configure Conduit purely with env vars.
2021-05-22Update docker command in READMEDaniel Wiesenberg
Mention the need for a config.
2021-05-22Update Dockerfile and docker-composeDaniel Wiesenberg
- 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
2020-10-18Fix order of docker command arguments and change repository link to...Daniel Wiesenberg
...github.com repo, to relieve some pressure from git.koesters.xyz.