diff options
| author | Timo Kösters <timo@koesters.xyz> | 2023-07-29 07:13:58 +0000 |
|---|---|---|
| committer | Timo Kösters <timo@koesters.xyz> | 2023-07-29 07:13:58 +0000 |
| commit | 97835541ce323ec06b68e2e46886d80cb29c7f24 (patch) | |
| tree | f7a7f66aea883f89013f5e91b16675c71cb2b7ba /docker | |
| parent | 1e675dbb682c3b7bf2d61cf10240d56f5eb8777a (diff) | |
| parent | 54a115caf337c339f1dc44aaa298257038c6e9f6 (diff) | |
| download | conduit-97835541ce323ec06b68e2e46886d80cb29c7f24.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/README.md b/docker/README.md index cd41291..8461af4 100644 --- a/docker/README.md +++ b/docker/README.md @@ -117,7 +117,7 @@ As a container user, you probably know about Traefik. It is a easy to use revers containerized app and services available through the web. With the two provided files, [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml) (or [`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)) and -[`docker-compose.override.yml`](docker-compose.override.traefik.yml), it is equally easy to deploy +[`docker-compose.override.yml`](docker-compose.override.yml), it is equally easy to deploy and use Conduit, with a little caveat. If you already took a look at the files, then you should have seen the `well-known` service, and that is the little caveat. Traefik is simply a proxy and loadbalancer and is not able to serve any kind of content, but for Conduit to federate, we need to @@ -128,7 +128,7 @@ With the service `well-known` we use a single `nginx` container that will serve So...step by step: -1. Copy [`docker-compose.traefik.yml`](docker-compose.traefik.yml) and [`docker-compose.override.traefik.yml`](docker-compose.override.traefik.yml) from the repository and remove `.traefik` from the filenames. +1. Copy [`docker-compose.traefik.yml`](docker-compose.traefik.yml) and [`docker-compose.override.yml`](docker-compose.override.yml) from the repository and remove `.traefik` from the filename. 2. Open both files and modify/adjust them to your needs. Meaning, change the `CONDUIT_SERVER_NAME` and the volume host mappings according to your needs. 3. Create the `conduit.toml` config file, an example can be found [here](../conduit-example.toml), or set `CONDUIT_CONFIG=""` and configure Conduit per env vars. 4. Uncomment the `element-web` service if you want to host your own Element Web Client and create a `element_config.json`. |