wallabag: upgrade to mariadb:11 and some improvements
This commit is contained in:
parent
d46f529f3d
commit
a4420a89e7
1 changed files with 6 additions and 10 deletions
|
@ -20,9 +20,9 @@ services:
|
||||||
- web
|
- web
|
||||||
- wallabag
|
- wallabag
|
||||||
volumes:
|
volumes:
|
||||||
- /var/dockervolumes/wallabag/images:/var/www/wallabag/web/assets/images
|
- ${VOLUMES_PATH}/wallabag/images:/var/www/wallabag/web/assets/images
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost"]
|
test: ["CMD", "curl" ,"--fail", "http://localhost/api/info"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
labels:
|
labels:
|
||||||
|
@ -37,18 +37,14 @@ services:
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: mariadb:10
|
image: mariadb:${MARIADB_VERSION}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
- MARIADB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||||
networks:
|
networks:
|
||||||
- wallabag
|
- wallabag
|
||||||
volumes:
|
volumes:
|
||||||
- /var/dockervolumes/wallabag/db:/var/lib/mysql
|
- /var/dockervolumes/wallabag/db:/var/lib/mysql
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 3s
|
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=wallabag"
|
- "docker.group=wallabag"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue