Tidy compose.yml

This commit is contained in:
3wc 2020-09-25 12:18:15 +02:00
parent 57dca0bed4
commit ed6cbc8495
1 changed files with 9 additions and 8 deletions

View File

@ -1,3 +1,4 @@
---
version: "3.8" version: "3.8"
services: services:
@ -7,10 +8,10 @@ services:
volumes: volumes:
- mariadb:/var/lib/mysql - mariadb:/var/lib/mysql
environment: environment:
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
- MYSQL_DATABASE=matomo - MYSQL_DATABASE=matomo
- MYSQL_USER=matomo - MYSQL_USER=matomo
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
networks: networks:
- internal - internal
secrets: secrets:
@ -19,7 +20,7 @@ services:
matomo: matomo:
image: matomo image: matomo
depends_on: depends_on:
- mariadb - mariadb
volumes: volumes:
- "matomo_config:/var/www/html/config" - "matomo_config:/var/www/html/config"
@ -55,12 +56,12 @@ volumes:
matomo_logs: matomo_logs:
secrets: secrets:
db_root_password: db_password:
external: true external: true
name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION}
db_root_password:
external: true
name: ${STACK_NAME}_db_root_password_${DB_ROOT_PASSWORD_VERSION} name: ${STACK_NAME}_db_root_password_${DB_ROOT_PASSWORD_VERSION}
db_password:
external: true
name: ${STACK_NAME}_db_password_${DB_ROOT_PASSWORD_VERSION}
networks: networks:
proxy: proxy: