-
-
Notifications
You must be signed in to change notification settings - Fork 140
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #713 from The-Commit-Company/develop
Merge Develop to rav-55
- Loading branch information
Showing
133 changed files
with
8,029 additions
and
2,451 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "name": "Frappe Bench", | ||
| "forwardPorts": [ | ||
| 8000, | ||
| 9000, | ||
| 6787 | ||
| ], | ||
| "remoteUser": "frappe", | ||
| "settings": { | ||
| "terminal.integrated.defaultProfile.linux": "bash", | ||
| "debug.node.autoAttach": "disabled" | ||
| }, | ||
| "dockerComposeFile": "./docker-compose.yml", | ||
| "service": "frappe", | ||
| "workspaceFolder": "/workspace/frappe-bench", | ||
| "postCreateCommand": "bash /workspace/scripts/init.sh", | ||
| "shutdownAction": "stopCompose", | ||
| "extensions": [ | ||
| "ms-python.python", | ||
| "ms-vscode.live-server", | ||
| "grapecity.gc-excelviewer", | ||
| "mtxr.sqltools", | ||
| "visualstudioexptteam.vscodeintellicode" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| version: "3.7" | ||
| services: | ||
| mariadb: | ||
| image: mariadb:10.6 | ||
| command: | ||
| - --character-set-server=utf8mb4 | ||
| - --collation-server=utf8mb4_unicode_ci | ||
| - --skip-character-set-client-handshake | ||
| - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 | ||
| environment: | ||
| MYSQL_ROOT_PASSWORD: 123 | ||
| volumes: | ||
| - mariadb-data:/var/lib/mysql | ||
|
|
||
| # Enable PostgreSQL only if you use it, see development/README.md for more information. | ||
| # postgresql: | ||
| # image: postgres:11.8 | ||
| # environment: | ||
| # POSTGRES_PASSWORD: 123 | ||
| # volumes: | ||
| # - postgresql-data:/var/lib/postgresql/data | ||
|
|
||
| redis-cache: | ||
| image: redis:alpine | ||
|
|
||
| redis-queue: | ||
| image: redis:alpine | ||
|
|
||
| redis-socketio: | ||
| image: redis:alpine | ||
|
|
||
| frappe: | ||
| image: frappe/bench:latest | ||
| command: sleep infinity | ||
| environment: | ||
| - SHELL=/bin/bash | ||
| volumes: | ||
| - ..:/workspace:cached | ||
| working_dir: /workspace/frappe-bench | ||
| ports: | ||
| - 8000-8005:8000-8005 | ||
| - 9000-9005:9000-9005 | ||
|
|
||
| volumes: | ||
| mariadb-data: | ||
| postgresql-data: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| { | ||
| // Use IntelliSense to learn about possible attributes. | ||
| // Hover to view descriptions of existing attributes. | ||
| // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "name": "Bench Web", | ||
| "type": "python", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", | ||
| "args": [ | ||
| "frappe", | ||
| "serve", | ||
| "--port", | ||
| "8000", | ||
| "--noreload", | ||
| "--nothreading" | ||
| ], | ||
| "cwd": "${workspaceFolder}/frappe-bench/sites", | ||
| "env": { | ||
| "DEV_SERVER": "1" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Bench Default Worker", | ||
| "type": "python", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", | ||
| "args": [ | ||
| "frappe", | ||
| "worker", | ||
| "--queue", | ||
| "default" | ||
| ], | ||
| "cwd": "${workspaceFolder}/frappe-bench/sites", | ||
| "env": { | ||
| "DEV_SERVER": "1" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Bench Short Worker", | ||
| "type": "python", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", | ||
| "args": [ | ||
| "frappe", | ||
| "worker", | ||
| "--queue", | ||
| "short" | ||
| ], | ||
| "cwd": "${workspaceFolder}/frappe-bench/sites", | ||
| "env": { | ||
| "DEV_SERVER": "1" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Bench Long Worker", | ||
| "type": "python", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", | ||
| "args": [ | ||
| "frappe", | ||
| "worker", | ||
| "--queue", | ||
| "long" | ||
| ], | ||
| "cwd": "${workspaceFolder}/frappe-bench/sites", | ||
| "env": { | ||
| "DEV_SERVER": "1" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Honcho SocketIO Watch Schedule Worker", | ||
| "type": "python", | ||
| "request": "launch", | ||
| "program": "/home/frappe/.local/bin/honcho", | ||
| "cwd": "${workspaceFolder}/frappe-bench", | ||
| "console": "internalConsole", | ||
| "args": [ | ||
| "start", | ||
| "socketio", | ||
| "watch", | ||
| "schedule", | ||
| "worker_short", | ||
| "worker_long", | ||
| "worker_default" | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "python.defaultInterpreterPath": "frappe-bench/env/bin/python", | ||
| "debug.node.autoAttach": "disabled", | ||
| "sqltools.connections": [ | ||
| { | ||
| "mysqlOptions": { | ||
| "authProtocol": "default" | ||
| }, | ||
| "previewLimit": 50, | ||
| "server": "mariadb", | ||
| "port": 3306, | ||
| "driver": "MariaDB", | ||
| "name": "MariaDB", | ||
| "username": "root", | ||
| "password": "123" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.