diff --git a/.env b/.env index 50637db30..18e922e67 100644 --- a/.env +++ b/.env @@ -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 diff --git a/.gitignore b/.gitignore index 9a34f1e89..cdcb8c41c 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ junit.xml .yarn/ .yarnrc.yml +docker-compose.local.yml diff --git a/docker-compose.local.yml b/docker-compose.local.yml new file mode 100644 index 000000000..32f3c32e7 --- /dev/null +++ b/docker-compose.local.yml @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 04e5c44de..3dfa1ff6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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