mirror of
https://github.com/frappe/bench.git
synced 2025-01-24 07:28:25 +00:00
Merge branch 'master' of github.com:frappe/bench into migrate-env-fix
This commit is contained in:
commit
1ae9bfb568
@ -21,13 +21,14 @@ def bench_command(bench_path='.'):
|
||||
setup_logging(bench_path=bench_path)
|
||||
|
||||
|
||||
from bench.commands.make import init, get_app, new_app, remove_app, exclude_app_for_update, include_app_for_update
|
||||
from bench.commands.make import init, get_app, new_app, remove_app, exclude_app_for_update, include_app_for_update, pip
|
||||
bench_command.add_command(init)
|
||||
bench_command.add_command(get_app)
|
||||
bench_command.add_command(new_app)
|
||||
bench_command.add_command(remove_app)
|
||||
bench_command.add_command(exclude_app_for_update)
|
||||
bench_command.add_command(include_app_for_update)
|
||||
bench_command.add_command(pip)
|
||||
|
||||
|
||||
from bench.commands.update import update, retry_upgrade, switch_to_branch, switch_to_master, switch_to_develop
|
||||
|
@ -93,3 +93,14 @@ def include_app_for_update(app_name):
|
||||
"Include app from updating"
|
||||
from bench.app import remove_from_excluded_apps_txt
|
||||
remove_from_excluded_apps_txt(app_name)
|
||||
|
||||
|
||||
@click.command('pip', context_settings={"ignore_unknown_options": True}, help="For pip help use `bench pip help [COMMAND]` or `bench pip [COMMAND] -h`")
|
||||
@click.argument('args', nargs=-1)
|
||||
@click.pass_context
|
||||
def pip(ctx, args):
|
||||
"Run pip commands in bench env"
|
||||
import os
|
||||
from bench.utils import get_env_cmd
|
||||
env_pip = get_env_cmd('pip')
|
||||
os.execv(env_pip, (env_pip,) + args)
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Easy Install Script
|
||||
|
||||
- This script will install the pre-requisites, install bench and setup an ERPNext site `(site1.local under frappe-bench)`
|
||||
- Passwords for Frappe Administrator and MariaDB (root) will be asked and saved under `~/passwoords.txt`
|
||||
- Passwords for Frappe Administrator and MariaDB (root) will be asked and saved under `~/passwords.txt`
|
||||
- MariaDB (root) password may be `password` on a fresh server
|
||||
- You can then login as **Administrator** with the Administrator password
|
||||
- The log file is saved under `/tmp/logs/install_bench.log` in case you run into any issues during the install.
|
||||
@ -45,7 +45,7 @@ Switch to `[frappe-user]` (using `su [frappe-user]`) and start the setup
|
||||
|
||||
*Note: `user` flag to create a user and install using that user (By default, the script will create a user with the username `frappe` if the --user flag is not used)*
|
||||
|
||||
For production or development, append teh `--production` or `--develop` flag to the command respectively.
|
||||
For production or development, append the `--production` or `--develop` flag to the command respectively.
|
||||
|
||||
sudo python3 install.py --production --user [frappe-user]
|
||||
|
||||
@ -88,4 +88,4 @@ TLDR; Save the logs!
|
||||
|
||||
3. A lot of things can go wrong in setting up the environment due to prior settings, company protocols or even breaking changes in system packages and their dependencies.
|
||||
|
||||
4. Sharing your logfile in any issues opened related to this can help us find solutions to it faster and make the sript better!
|
||||
4. Sharing your logfile in any issues opened related to this can help us find solutions to it faster and make the sript better!
|
||||
|
Loading…
x
Reference in New Issue
Block a user