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

frontend depends_on websocket to avoid error on startup (#1313)

Browse source 
* frontend depends_on websocket to avoid error on startup

* ci: fix lint

---------

Co-authored-by: Revant Nandgaonkar <revant.one@gmail.com>
This commit is contained in:
Tengku Izdihar 2024-01-26 12:48:26 +07:00 committed by GitHub
parent c8c6f82645
commit 337a024a21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -25,3 +25,6 @@ development/*
*.pyc *.pyc
__pycache__ __pycache__
venv venv
# NodeJS
node_modules

10
devcontainer-example/devcontainer.json
View file

@ -5,11 +5,11 @@
"settings": { "settings": {
"terminal.integrated.profiles.linux": { "terminal.integrated.profiles.linux": {
"frappe bash": { "frappe bash": {
"path": "/bin/bash" "path": "/bin/bash",
} },
}, },
"terminal.integrated.defaultProfile.linux": "frappe bash", "terminal.integrated.defaultProfile.linux": "frappe bash",
"debug.node.autoAttach": "disabled" "debug.node.autoAttach": "disabled",
}, },
"dockerComposeFile": "./docker-compose.yml", "dockerComposeFile": "./docker-compose.yml",
"service": "frappe", "service": "frappe",
@ -20,6 +20,6 @@
"ms-vscode.live-server", "ms-vscode.live-server",
"grapecity.gc-excelviewer", "grapecity.gc-excelviewer",
"mtxr.sqltools", "mtxr.sqltools",
"visualstudioexptteam.vscodeintellicode" "visualstudioexptteam.vscodeintellicode",
] ],
} }

2
pwd.yml
View file

@ -90,6 +90,8 @@ services:
frontend: frontend:
image: frappe/erpnext:v15.10.6 image: frappe/erpnext:v15.10.6
depends_on:
- websocket
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure