accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-24 11:05:29 +00:00
Code Issues Releases Activity

fix: mysql command with subprocess

Browse Source
This commit is contained in:
Revant Nandgaonkar 2020-07-10 15:42:36 +05:30
parent fa2aff47df
commit 31ff697835
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/common/commands/new.py
View File

@ -98,15 +98,15 @@ def main():
mysql_command = ["mysql", f"-h{db_host}", f"-u{mariadb_root_username}", f"-p{mariadb_root_password}", "-e"] mysql_command = ["mysql", f"-h{db_host}", f"-u{mariadb_root_username}", f"-p{mariadb_root_password}", "-e"]
# update User's host to '%' required to connect from any container # update User's host to '%' required to connect from any container
command = mysql_command + [f"\"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;\""] command = mysql_command + [f"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;"]
run_command(command) run_command(command)
# Set db password # Set db password
command = mysql_command + [f"\"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\""] command = mysql_command + [f"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"]
run_command(command) run_command(command)
# Grant permission to database # Grant permission to database
command = mysql_command + [f"\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;\""] command = mysql_command + [f"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;"]
run_command(command) run_command(command)
if frappe.redis_server: if frappe.redis_server:

10
build/common/commands/restore_backup.py
View File

@ -229,22 +229,22 @@ def restore_mariadb(config, site_config, database_file):
mysql_command = ["mysql", f"-u{db_root_user}", f"-h{db_host}", f"-p{db_root_password}", f"-P{db_port}"] mysql_command = ["mysql", f"-u{db_root_user}", f"-h{db_host}", f"-p{db_root_password}", f"-P{db_port}"]
# drop db if exists for clean restore # drop db if exists for clean restore
drop_database = mysql_command + ["-e", f"\"DROP DATABASE IF EXISTS \`{db_name}\`;\""] drop_database = mysql_command + ["-e", f"DROP DATABASE IF EXISTS \`{db_name}\`;"]
run_command(drop_database) run_command(drop_database)
# create db # create db
create_database = mysql_command + ["-e", f"\"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;\""] create_database = mysql_command + ["-e", f"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;"]
run_command(create_database) run_command(create_database)
# create user # create user
create_user = mysql_command + ["-e", f"\"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;\""] create_user = mysql_command + ["-e", f"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;"]
run_command(create_user) run_command(create_user)
# grant db privileges to user # grant db privileges to user
grant_privileges = mysql_command + ["-e", f"\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\""] grant_privileges = mysql_command + ["-e", f"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"]
run_command(grant_privileges) run_command(grant_privileges)
command = mysql_command + [f"'{db_name}'", "<", database_file.replace(".gz", "")] command = mysql_command + [f"{db_name}", "<", database_file.replace(".gz", "")]
print('Restoring MariaDB') print('Restoring MariaDB')
run_command(command) run_command(command)