fix wallbag and glances
This commit is contained in:
parent
969e664c23
commit
8af4b7d9a2
2 changed files with 4 additions and 10 deletions
|
@ -3,16 +3,15 @@ version: '3'
|
||||||
services:
|
services:
|
||||||
glances:
|
glances:
|
||||||
container_name: glances
|
container_name: glances
|
||||||
image: nicolargo/glances:3.2.0
|
image: nicolargo/glances:3.2.3.1
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
environment:
|
|
||||||
- GLANCES_OPT="-w"
|
|
||||||
pid: host
|
pid: host
|
||||||
networks:
|
networks:
|
||||||
- srv
|
- srv
|
||||||
expose:
|
expose:
|
||||||
- 61208
|
- 61208
|
||||||
environment:
|
environment:
|
||||||
|
- GLANCES_OPT=-w
|
||||||
- VIRTUAL_HOST=${HOST_GLANCES}.${DOMAIN}
|
- VIRTUAL_HOST=${HOST_GLANCES}.${DOMAIN}
|
||||||
- VIRTUAL_PORT=61208
|
- VIRTUAL_PORT=61208
|
||||||
|
|
|
@ -4,13 +4,6 @@ services:
|
||||||
wallabag:
|
wallabag:
|
||||||
container_name: wallabag
|
container_name: wallabag
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
|
|
||||||
SYMFONY__ENV__DOMAIN_NAME: https://${HOST_WALLABAG}.${DOMAIN}
|
|
||||||
SYMFONY__ENV__FOSUSER_REGISTRATION: "false"
|
|
||||||
SYMFONY__ENV__FROM_EMAIL: ${ADMIN_EMAIL}
|
|
||||||
SYMFONY__ENV__MAILER_HOST: 127.0.0.1
|
|
||||||
SYMFONY__ENV__MAILER_PASSWORD: '~'
|
|
||||||
SYMFONY__ENV__MAILER_USER: '~'
|
|
||||||
image: wallabag/wallabag
|
image: wallabag/wallabag
|
||||||
networks:
|
networks:
|
||||||
- srv
|
- srv
|
||||||
|
@ -20,6 +13,8 @@ services:
|
||||||
- wallabag_data:/var/www/wallabag/data:rw
|
- wallabag_data:/var/www/wallabag/data:rw
|
||||||
- wallabag_images:/var/www/wallabag/web/assets/images:rw
|
- wallabag_images:/var/www/wallabag/web/assets/images:rw
|
||||||
environment:
|
environment:
|
||||||
|
- SYMFONY__ENV__DOMAIN_NAME="https://${HOST_WALLABAG}.${DOMAIN}"
|
||||||
|
- SYMFONY__ENV__FOSUSER_REGISTRATION=false
|
||||||
- VIRTUAL_HOST=${HOST_WALLABAG}.${DOMAIN}
|
- VIRTUAL_HOST=${HOST_WALLABAG}.${DOMAIN}
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
|
Loading…
Add table
Reference in a new issue