summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Kösters <timo@koesters.xyz>2023-08-09 07:55:49 +0000
committerTimo Kösters <timo@koesters.xyz>2023-08-09 07:55:49 +0000
commit2581f7a10bf9d1f6aa721e990de6837970204085 (patch)
tree6dd0420d9ddbd98efda94c9b96f954645003d516
parent3e518773e20849bb712c7942fcc2d0a5147f7868 (diff)
parentc0a2acb869ec25898ccbce8e70d94d6274ada4d9 (diff)
downloadconduit-2581f7a10bf9d1f6aa721e990de6837970204085.zip
Merge branch 'fix-broken-links' into 'next'
Docs: Fix broken links in docker documentation See merge request famedly/conduit!520
-rw-r--r--docker/README.md3
-rw-r--r--docker/docker-compose.yml (renamed from docker-compose.yml)0
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/README.md b/docker/README.md
index 8461af4..8aa4198 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -128,7 +128,8 @@ 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.yml`](docker-compose.override.yml) from the repository and remove `.traefik` from the filename.
+1. Copy [`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.yml) from the repository and remove `.for-traefik` (or `.with-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`.
diff --git a/docker-compose.yml b/docker/docker-compose.yml
index 5bcf84f..5bcf84f 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml