accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2025-02-03 04:28:31 +00:00
Code Issues Releases Activity

feat: optional site level db connection

Browse Source
This commit is contained in:
Revant Nandgaonkar 2020-06-30 06:32:46 +05:30
parent 87558b7f0d
commit 8a93944de7
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,10 +30,10 @@ def _get_password_from_secret(env_var):
def main(): def main():
db_type = 'mariadb'
db_host = None
db_port = None
config = get_config() config = get_config()
db_type = 'mariadb'
db_port = config.get('db_port', 3306)
db_host = config.get('db_host')
site_name = os.environ.get("SITE_NAME", 'site1.localhost') site_name = os.environ.get("SITE_NAME", 'site1.localhost')
mariadb_root_username = os.environ.get("DB_ROOT_USER", 'root') mariadb_root_username = os.environ.get("DB_ROOT_USER", 'root')
mariadb_root_password = get_password("MYSQL_ROOT_PASSWORD", 'admin') mariadb_root_password = get_password("MYSQL_ROOT_PASSWORD", 'admin')
@ -42,8 +42,9 @@ def main():
if postgres_root_password: if postgres_root_password:
db_type = 'postgres' db_type = 'postgres'
db_host = os.environ.get("POSTGRES_HOST") db_host = os.environ.get("POSTGRES_HOST")
db_port = '5432' db_port = 5432
if not db_host: if not db_host:
db_host = config.get('db_host')
print('Environment variable POSTGRES_HOST not found.') print('Environment variable POSTGRES_HOST not found.')
print('Using db_host from common_site_config.json') print('Using db_host from common_site_config.json')

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

@ -199,7 +199,7 @@ def restore_postgres(config, site_config, database_file):
# site config # site config
db_host = site_config.get('db_host') db_host = site_config.get('db_host')
db_port = site_config.get('db_port', '5432') db_port = site_config.get('db_port', 5432)
db_name = site_config.get('db_name') db_name = site_config.get('db_name')
db_password = site_config.get('db_password') db_password = site_config.get('db_password')
@ -235,43 +235,49 @@ def restore_mariadb(config, site_config, database_file):
db_root_user = os.environ.get("DB_ROOT_USER", 'root') db_root_user = os.environ.get("DB_ROOT_USER", 'root')
db_host = site_config.get('db_host', config.get('db_host'))
db_port = site_config.get('db_port', config.get('db_port'))
# mysql command prefix # mysql command prefix
mysql_command = 'mysql -u{db_root_user} -h{db_host} -p{db_password} -e '.format( mysql_command = 'mysql -u{db_root_user} -h{db_host} -p{db_password}'.format(
db_root_user=db_root_user, db_root_user=db_root_user,
db_host=config.get('db_host'), db_host=db_host,
db_port=db_port,
db_password=db_root_password db_password=db_root_password
) )
# drop db if exists for clean restore # drop db if exists for clean restore
drop_database = mysql_command + "\"DROP DATABASE IF EXISTS \`{db_name}\`;\"".format( drop_database = "{mysql_command} -e \"DROP DATABASE IF EXISTS \`{db_name}\`;\"".format(
db_name=site_config.get('db_name') mysql_command=mysql_command,
db_name=site_config.get('db_name'),
) )
os.system(drop_database) os.system(drop_database)
# create db # create db
create_database = mysql_command + "\"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;\"".format( create_database = "{mysql_command} -e \"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;\"".format(
db_name=site_config.get('db_name') mysql_command=mysql_command,
db_name=site_config.get('db_name'),
) )
os.system(create_database) os.system(create_database)
# create user # create user
create_user = mysql_command + "\"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;\"".format( create_user = "{mysql_command} -e \"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;\"".format(
mysql_command=mysql_command,
db_name=site_config.get('db_name'), db_name=site_config.get('db_name'),
db_password=site_config.get('db_password') db_password=site_config.get('db_password'),
) )
os.system(create_user) os.system(create_user)
# grant db privileges to user # grant db privileges to user
grant_privileges = mysql_command + "\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\"".format( grant_privileges = "{mysql_command} -e \"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\"".format(
mysql_command=mysql_command,
db_name=site_config.get('db_name'), db_name=site_config.get('db_name'),
db_password=site_config.get('db_password') db_password=site_config.get('db_password'),
) )
os.system(grant_privileges) os.system(grant_privileges)
command = "mysql -u{db_root_user} -h{db_host} -p{db_password} '{db_name}' < {database_file}".format( command = "{mysql_command} '{db_name}' < {database_file}".format(
db_root_user=db_root_user, mysql_command=mysql_command,
db_host=config.get('db_host'),
db_password=db_root_password,
db_name=site_config.get('db_name'), db_name=site_config.get('db_name'),
database_file=database_file.replace('.gz', ''), database_file=database_file.replace('.gz', ''),
) )

2
build/common/common_site_config.json.template
View File

@ -1,6 +1,6 @@
{ {
"db_host": "${DB_HOST}", "db_host": "${DB_HOST}",
"db_port": "${DB_PORT}", "db_port": ${DB_PORT},
"redis_cache": "redis://${REDIS_CACHE}", "redis_cache": "redis://${REDIS_CACHE}",
"redis_queue": "redis://${REDIS_QUEUE}", "redis_queue": "redis://${REDIS_QUEUE}",
"redis_socketio": "redis://${REDIS_SOCKETIO}", "redis_socketio": "redis://${REDIS_SOCKETIO}",