Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,5 @@ export KRATOS_ADMIN_API="http://localhost:4434"
export CONFIG_PATH="$HOME/.config/flash"

export ERPNEXT_JWT_SECRET="not-so-secret"

COMPOSE_FILE=docker-compose.yml:docker-compose.override.yml:docker-compose.local.yml
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ junit.xml
.yarn/
.yarnrc.yml

docker-compose.local.yml
7 changes: 7 additions & 0 deletions docker-compose.local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Local overrides — this file is committed but changes are personal.
# Example: bind mount local frappe-flash-admin for live editing
#
# services:
# frappe-backend:
# volumes:
# - ../frappe-flash-admin/admin_panel:/home/frappe/frappe-bench/apps/admin_panel
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ services:
# Frappe/ERPNext services
frappe-backend:
# image: lnflash/frappe-erp-admin:latest
image: brh28/frappe-flash:0.0.4
image: brh28/frappe-flash:${FRAPPE_TAG:-latest}
deploy:
restart_policy:
condition: on-failure
Expand All @@ -213,7 +213,7 @@ services:
MARIADB_ROOT_PASSWORD: admin

frappe-configurator:
image: brh28/frappe-flash:0.0.4
image: brh28/frappe-flash:${FRAPPE_TAG:-latest}
deploy:
restart_policy:
condition: none
Expand Down Expand Up @@ -245,7 +245,7 @@ services:
- frappe-logs:/home/frappe/frappe-bench/logs

frappe-create-site:
image: brh28/frappe-flash:0.0.4
image: brh28/frappe-flash:${FRAPPE_TAG:-latest}
deploy:
restart_policy:
condition: none
Expand Down Expand Up @@ -299,7 +299,7 @@ services:
- mariadb-data:/var/lib/mysql

frappe-frontend:
image: brh28/frappe-flash:0.0.4
image: brh28/frappe-flash:${FRAPPE_TAG:-latest}
ports: ["8080:8080"]
depends_on:
- frappe-websocket
Expand All @@ -322,7 +322,7 @@ services:
- frappe-logs:/home/frappe/frappe-bench/logs

frappe-websocket:
image: brh28/frappe-flash:0.0.4
image: brh28/frappe-flash:${FRAPPE_TAG:-latest}
deploy:
restart_policy:
condition: on-failure
Expand Down