epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-26 09:05:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #369 from frappe/develop

Browse source 
build improvements
This commit is contained in:
Revant Nandgaonkar 2020-10-15 08:06:46 +05:30 committed by GitHub
commit 8e4c7883c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/common/commands/new.py
View file

@ -83,25 +83,17 @@ def main():
mysql_command = ["mysql", f"-h{db_host}", f"-u{db_root_username}", f"-p{mariadb_root_password}", "-e"] mysql_command = ["mysql", f"-h{db_host}", f"-u{db_root_username}", f"-p{mariadb_root_password}", "-e"]
# Drop User if exists # Drop User if exists
command = mysql_command + [f"DROP USER IF EXISTS '{db_name}'@'%'; FLUSH PRIVILEGES;"] command = mysql_command + [f"DROP USER IF EXISTS '{db_name}'; FLUSH PRIVILEGES;"]
run_command(command) run_command(command)
# update User's host to '%' required to connect from any container # Grant permission to database and set password
command = mysql_command + [f"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;"]
run_command(command)
# Set db password
command = mysql_command + [f"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"]
run_command(command)
# Grant permission to database
grant_privileges = "ALL PRIVILEGES" grant_privileges = "ALL PRIVILEGES"
# for Amazon RDS # for Amazon RDS
if config.get(RDS_DB) or site_config.get(RDS_DB): if config.get(RDS_DB) or site_config.get(RDS_DB):
grant_privileges = RDS_PRIVILEGES grant_privileges = RDS_PRIVILEGES
command = mysql_command + [f"GRANT {grant_privileges} ON `{db_name}`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;"] command = mysql_command + [f"GRANT {grant_privileges} ON `{db_name}`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"]
run_command(command) run_command(command)
if frappe.redis_server: if frappe.redis_server:

12
development/.vscode/launch.json vendored
View file

@ -60,5 +60,17 @@
"DEV_SERVER": "1" "DEV_SERVER": "1"
} }
}, },
{
"name": "Honcho SocketIO Watch Schedule Worker",
"type": "python",
"request": "launch",
"pythonPath": "/usr/bin/python3",
"program": "/home/frappe/.local/bin/honcho",
"cwd": "${workspaceFolder}/frappe-bench",
"console": "internalConsole",
"args": [
"start", "socketio", "watch", "schedule", "worker_short", "worker_long", "worker_default"
]
}
] ]
} }

2
development/README.md
View file

@ -195,6 +195,8 @@ honcho start \
worker_default worker_default
``` ```
Alternatively you can use the VSCode launch configuration "Honcho SocketIO Watch Schedule Worker" which launches the same command as above.
This command starts all processes with the exception of Redis (which is already running in separate container) and the `web` process. The latter can can finally be started from the debugger tab of VSCode by clicking on the "play" button. This command starts all processes with the exception of Redis (which is already running in separate container) and the `web` process. The latter can can finally be started from the debugger tab of VSCode by clicking on the "play" button.
You can now login with user `Administrator` and the password you choose when creating the site, if you followed this guide's unattended install that password is going to be `admin`. You can now login with user `Administrator` and the password you choose when creating the site, if you followed this guide's unattended install that password is going to be `admin`.