jimmy/restic-compose-backup
1
0
Fork 0
mirror of https://github.com/ZettaIO/restic-compose-backup.git synced 2025-12-13 17:34:57 +00:00
Code Issues Projects Releases Wiki Activity

fix: ping db with password

Browse Source
This commit is contained in:
Silthus
2021-03-08 19:29:42 +01:00
committed by Silthus
parent 1f4d81e319
commit b02376354c
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mydumper

Submodule src/mydumper updated: 1fabdf87e3...bedaa052d3

6
src/restic_compose_backup/commands.py
View File

@@ -9,7 +9,7 @@ def test():
return run(['ls', '/volumes']) return run(['ls', '/volumes'])
def ping_mysql(host, port, username) -> int: def ping_mysql(host, port, username, password) -> int:
"""Check if the mysql is up and can be reached""" """Check if the mysql is up and can be reached"""
return run([ return run([
'mysqladmin', 'mysqladmin',
@@ -20,6 +20,8 @@ def ping_mysql(host, port, username) -> int:
port, port,
'--user', '--user',
username, username,
'--password',
password
]) ])
@@ -34,6 +36,8 @@ def ping_mariadb(host, port, username) -> int:
port, port,
'--user', '--user',
username, username,
'--password',
password
]) ])

24
src/restic_compose_backup/containers_db.py
View File

@@ -25,12 +25,12 @@ class MariadbContainer(Container):
"""Check the availability of the service""" """Check the availability of the service"""
creds = self.get_credentials() creds = self.get_credentials()
with utils.environment('MYSQL_PASSWORD', creds['password']): return commands.ping_mariadb(
return commands.ping_mariadb( creds['host'],
creds['host'], creds['port'],
creds['port'], creds['username'],
creds['username'], creds['password']
) )
def dump_command(self) -> list: def dump_command(self) -> list:
"""list: create a dump command restic and use to send data through stdin""" """list: create a dump command restic and use to send data through stdin"""
@@ -100,12 +100,12 @@ class MysqlContainer(Container):
"""Check the availability of the service""" """Check the availability of the service"""
creds = self.get_credentials() creds = self.get_credentials()
with utils.environment('MYSQL_PASSWORD', creds['password']): return commands.ping_mysql(
return commands.ping_mysql( creds['host'],
creds['host'], creds['port'],
creds['port'], creds['username'],
creds['username'], creds['password']
) )
def dump_command(self) -> list: def dump_command(self) -> list:
"""list: create a dump command restic and use to send data through stdin""" """list: create a dump command restic and use to send data through stdin"""