summaryrefslogtreecommitdiff
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorDaniel Wiesenberg <weasy@hotmail.de>2020-08-02 15:55:40 +0200
committerDaniel Wiesenberg <weasy@hotmail.de>2020-08-11 15:38:24 +0200
commit7456caeefd487bffdbcc706fcf7a6310d662e807 (patch)
tree8594b8401ed2ad6cbbdbf7d6b3bf0c0edd73ebc2 /docker-compose.yml
parent5f3cb3f9261537b884a91949421f10c8a451eb9a (diff)
downloadconduit-7456caeefd487bffdbcc706fcf7a6310d662e807.zip
Add Element-Web to compose and provide extra compose files for using..
..Conduit behind Traefik Reverse Proxy
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml18
1 files changed, 16 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c27360..3a390aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,10 +3,10 @@ version: '3'
services:
homeserver:
- image: conduit_homeserver
+ image: conduit_homeserver:latest
restart: unless-stopped
ports:
- - 14004:8000
+ - 8448:8000
volumes:
- db:/srv/conduit/.local/share/conduit
### Uncomment if you want to use Rocket.toml to configure Conduit
@@ -23,5 +23,19 @@ services:
# ROCKET_WORKERS: 10
# ROCKET_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
+ ### Uncomment if you want to use your own Element-Web App.
+ ### Note: You need to provide a config.json for Element and you also need a second
+ ### Domain or Subdomain for the communication between Element and Conduit
+ ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md
+ # element-web:
+ # image: vectorim/riot-web:latest
+ # restart: unless-stopped
+ # ports:
+ # - 8009:80
+ # volumes:
+ # - ./element_config.json:/app/config.json
+ # depends_on:
+ # - homeserver
+
volumes:
db: