mirror of
https://github.com/bitwarden/server
synced 2025-12-06 00:03:34 +00:00
Fix MariaDB support for development (#6420)
- fix volume error when starting Docker container - fix overlapping indexes of integration test databases - add ef profile to start all EF containers at once
This commit is contained in:
@@ -53,6 +53,7 @@ services:
|
||||
- ./.data/postgres/log:/var/log/postgresql
|
||||
profiles:
|
||||
- postgres
|
||||
- ef
|
||||
|
||||
mysql:
|
||||
image: mysql:8.0
|
||||
@@ -69,6 +70,7 @@ services:
|
||||
- mysql_dev_data:/var/lib/mysql
|
||||
profiles:
|
||||
- mysql
|
||||
- ef
|
||||
|
||||
mariadb:
|
||||
image: mariadb:10
|
||||
@@ -76,13 +78,13 @@ services:
|
||||
- 4306:3306
|
||||
environment:
|
||||
MARIADB_USER: maria
|
||||
MARIADB_PASSWORD: ${MARIADB_ROOT_PASSWORD}
|
||||
MARIADB_DATABASE: vault_dev
|
||||
MARIADB_RANDOM_ROOT_PASSWORD: "true"
|
||||
volumes:
|
||||
- mariadb_dev_data:/var/lib/mysql
|
||||
profiles:
|
||||
- mariadb
|
||||
- ef
|
||||
|
||||
idp:
|
||||
image: kenchan0130/simplesamlphp:1.19.8
|
||||
@@ -153,5 +155,6 @@ volumes:
|
||||
mssql_dev_data:
|
||||
postgres_dev_data:
|
||||
mysql_dev_data:
|
||||
mariadb_dev_data:
|
||||
rabbitmq_data:
|
||||
redis_data:
|
||||
|
||||
@@ -70,7 +70,7 @@ Foreach ($item in @(
|
||||
@($mysql, "MySQL", "MySqlMigrations", "mySql", 2),
|
||||
# MariaDB shares the MySQL connection string in the server config so they are mutually exclusive in that context.
|
||||
# However they can still be run independently for integration tests.
|
||||
@($mariadb, "MariaDB", "MySqlMigrations", "mySql", 3)
|
||||
@($mariadb, "MariaDB", "MySqlMigrations", "mySql", 4)
|
||||
)) {
|
||||
if (!$item[0] -and !$all) {
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user