diff --git a/compose.yml b/compose.yml index 091e150..84a549c 100644 --- a/compose.yml +++ b/compose.yml @@ -1,4 +1,3 @@ ---- version: "3.8" services: @@ -36,30 +35,32 @@ services: timeout: 10s retries: 10 start_period: 1m - db: - image: "mysql:9.1" - volumes: - - mysql-data:/var/lib/mysql - environment: - - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password - - MYSQL_USER_FILE=/run/secrets/db_username - - MYSQL_PASSWORD_FILE=/run/secrets/db_password - - MYSQL_DATABASE=xwiki - command: - - "--character-set-server=utf8mb4" - - "--collation-server=utf8mb4_bin" - - "--explicit-defaults-for-timestamp=1" - secrets: - - db_username - - db_password - - db_root_password + db: + image: "mysql:9.1" + volumes: + - mysql-data:/var/lib/mysql + environment: + - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password + - MYSQL_USER_FILE=/run/secrets/db_username + - MYSQL_PASSWORD_FILE=/run/secrets/db_password + - MYSQL_DATABASE=xwiki + command: + - "--character-set-server=utf8mb4" + - "--collation-server=utf8mb4_bin" + - "--explicit-defaults-for-timestamp=1" + secrets: + - db_username + - db_password + - db_root_password networks: proxy: external: true + volumes: mysql-data: xwiki-data: + secrets: db_username: name: ${STACK_NAME}_db_username_${SECRET_DB_USERNAME_VERSION}