diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9d5aa02..174a6bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -25,8 +25,5 @@ "dockerComposeFile": "./docker-compose.yml", "service": "frappe", "workspaceFolder": "/workspace/development", - "shutdownAction": "stopCompose", - "mounts": [ - "source=${localEnv:USERPROFILE}/.ssh,target=/home/frappe/.ssh,type=bind,consistency=cached" - ] + "shutdownAction": "stopCompose" } \ No newline at end of file diff --git a/development/.vscode/settings.json b/development/.vscode/settings.json index 38b6deb..9c26018 100644 --- a/development/.vscode/settings.json +++ b/development/.vscode/settings.json @@ -4,5 +4,12 @@ "editor.defaultFormatter": "ms-python.python", "editor.formatOnSave": true }, - "python.formatting.blackPath": "${workspaceFolder}/frappe-bench/env/bin/black" + "python.formatting.blackPath": "${workspaceFolder}/frappe-bench/env/bin/black", + "git.autoRepositoryDetection": true, + "git.detectSubmodules": true, + "git.detectSubmodulesLimit": 20, + "git.repositoryScanMaxDepth": 3, + "git.scanRepositories": [ + "${workspaceFolder}/frappe-bench/apps" + ] } \ No newline at end of file diff --git a/development/build.sh b/development/build.sh index ede54d7..5a0232d 100644 --- a/development/build.sh +++ b/development/build.sh @@ -98,7 +98,13 @@ BENCH_DIR="$DEV_DIR/frappe-bench" if [ ! -d "$BENCH_DIR" ]; then echo "Starting bench setup..." - CMD_BENCH_SETUP="bench init --skip-redis-config-generation frappe-bench" + # Determine which Python interpreter to use (prefer python3.11 if available) + if command -v python3.11 >/dev/null 2>&1; then + PYTHON_BIN="python3.11" + else + PYTHON_BIN="python3" + fi + CMD_BENCH_SETUP="bench init --skip-redis-config-generation --python $PYTHON_BIN frappe-bench" if [ "$USE_BENCH_V15" == "y" ] || [ "$USE_BENCH_V15" == "Y" ]; then echo "Using Frappe-bench v15" CMD_BENCH_SETUP+=" --frappe-branch version-15"