char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add build option to compose file

next
Daniel Wiesenberg 2020-08-02 16:29:50 +02:00
parent 7456caeefd
commit 31c725660f
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.override.traefik.yml
View File

@ -5,7 +5,7 @@ services:
homeserver: homeserver:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=proxy" - "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network
- "traefik.http.routers.to-conduit.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)" # Change to the address on which Conduit is hosted - "traefik.http.routers.to-conduit.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)" # Change to the address on which Conduit is hosted
- "traefik.http.routers.to-conduit.tls=true" - "traefik.http.routers.to-conduit.tls=true"
@ -14,7 +14,7 @@ services:
element-web: element-web:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=proxy" - "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network
- "traefik.http.routers.to-element-web.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)" # Change to the address on which Element-Web is hosted - "traefik.http.routers.to-element-web.rule=Host(`<SUBDOMAIN>.<DOMAIN>`)" # Change to the address on which Element-Web is hosted
- "traefik.http.routers.to-element-web.tls=true" - "traefik.http.routers.to-element-web.tls=true"

12
docker-compose.traefik.yml
View File

@ -3,7 +3,17 @@ version: '3'
services: services:
homeserver: homeserver:
### If you already built the Conduit image with 'docker build', then you are ready to
### go. Otherwise, you need to comment the 'image' line and uncomment the 'build' lines
### and run: CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d
image: conduit_homeserver:latest image: conduit_homeserver:latest
# build:
# context: .
# args:
# CREATED:
# VERSION:
# LOCAL: false
# GIT_REF: HEAD
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- db:/srv/conduit/.local/share/conduit - db:/srv/conduit/.local/share/conduit
@ -16,7 +26,7 @@ services:
ROCKET_SERVER_NAME: localhost:8000 # replace with your own name ROCKET_SERVER_NAME: localhost:8000 # replace with your own name
### Uncomment and change values as desired ### Uncomment and change values as desired
# ROCKET_LOG: normal # Available levels are: off, debug, normal, critical # ROCKET_LOG: normal # Available levels are: off, debug, normal, critical
# ROCKET_PORT: 14004 # ROCKET_PORT: 8000
# ROCKET_REGISTRATION_DISABLED: 'true' # ROCKET_REGISTRATION_DISABLED: 'true'
# ROCKET_ENCRYPTION_DISABLED: 'true' # ROCKET_ENCRYPTION_DISABLED: 'true'
# ROCKET_DATABASE_PATH: /srv/conduit/.local/share/conduit # ROCKET_DATABASE_PATH: /srv/conduit/.local/share/conduit

12
docker-compose.yml
View File

@ -3,7 +3,17 @@ version: '3'
services: services:
homeserver: homeserver:
### If you already built the Conduit image with 'docker build', then you are ready to
### go. Otherwise, you need to comment the 'image' line and uncomment the 'build' lines
### and run: CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d
image: conduit_homeserver:latest image: conduit_homeserver:latest
# build:
# context: .
# args:
# CREATED:
# VERSION:
# LOCAL: "false"
# GIT_REF: HEAD
restart: unless-stopped restart: unless-stopped
ports: ports:
- 8448:8000 - 8448:8000
@ -16,7 +26,7 @@ services:
ROCKET_SERVER_NAME: localhost:8000 # replace with your own name ROCKET_SERVER_NAME: localhost:8000 # replace with your own name
### Uncomment and change values as desired ### Uncomment and change values as desired
# ROCKET_LOG: normal # Available levels are: off, debug, normal, critical # ROCKET_LOG: normal # Available levels are: off, debug, normal, critical
# ROCKET_PORT: 14004 # ROCKET_PORT: 8000
# ROCKET_REGISTRATION_DISABLED: 'true' # ROCKET_REGISTRATION_DISABLED: 'true'
# ROCKET_ENCRYPTION_DISABLED: 'true' # ROCKET_ENCRYPTION_DISABLED: 'true'
# ROCKET_DATABASE_PATH: /srv/conduit/.local/share/conduit # ROCKET_DATABASE_PATH: /srv/conduit/.local/share/conduit