Add Docker Secrets Support for Database Password & fixed missing boto3 dependency in tests (#1657)
* Added overrider to use docker secrets for mariadb password * typo in overrider file name * typo in overrider mariadb-secrets * typo in overriider mariadb-secrets * Secrets enviroment variable override * secrets need different enviroment variable name * no - for env variables * Updated deprecated MinIO Env Variables * refactored to be more robust and better error handling * temprary debugging changes * Revert "temprary debugging changes" This reverts commitd01931064d. * Revert "refactored to be more robust and better error handling" This reverts commitfe508668a8. * Revert "Updated deprecated MinIO Env Variables" This reverts commit76e66b5262. * manually added boto3 before running _create_bucket * lint formatting
This commit is contained in:
13
overrides/compose.mariadb-secrets.yaml
Normal file
13
overrides/compose.mariadb-secrets.yaml
Normal file
@@ -0,0 +1,13 @@
|
||||
services:
|
||||
db:
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: !reset null
|
||||
MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_password
|
||||
healthcheck:
|
||||
test: mysqladmin ping -h localhost --password="$(cat /run/secrets/db_password)"
|
||||
secrets:
|
||||
- db_password
|
||||
|
||||
secrets:
|
||||
db_password:
|
||||
file: ${DB_PASSWORD_SECRETS_FILE:?No db secret file set}
|
||||
@@ -10,7 +10,7 @@ services:
|
||||
db:
|
||||
image: mariadb:10.6
|
||||
healthcheck:
|
||||
test: mysqladmin ping -h localhost --password=${DB_PASSWORD}
|
||||
test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-123}
|
||||
interval: 1s
|
||||
retries: 20
|
||||
restart: unless-stopped
|
||||
@@ -20,7 +20,7 @@ services:
|
||||
- --skip-character-set-client-handshake
|
||||
- --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:?No db password set}
|
||||
MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-123}
|
||||
volumes:
|
||||
- db-data:/var/lib/mysql
|
||||
|
||||
|
||||
Reference in New Issue
Block a user