admin/frappe_docker
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
chabad360
2020-03-05 01:43:50 +00:00
parent 2d459987c3 1843e8a642
commit d6e012e9c0
7 changed files with 313 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ site_name = os.environ.get("SITE_NAME", 'site1.localhost')
mariadb_root_username = os.environ.get("DB_ROOT_USER", 'root')
mariadb_root_password = os.environ.get("MYSQL_ROOT_PASSWORD", 'admin')
force = True if os.environ.get("FORCE", None) else False
install_apps = os.environ.get("INSTALL_APPS").split(",")
install_apps = if os.environ.get("INSTALL_APPS").split(",") else []
frappe.init(site_name, new_site=True)
_new_site(