From 177f5ab96feb8001819eb42cbf0752d6f87a8e80 Mon Sep 17 00:00:00 2001 From: Arken June Malvecino <83942196+arkenm@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:55:34 +0800 Subject: [PATCH] Install Latest Version to Mac/Linux Doc Update (#1360) * refactor: update from pwd.yml * refactor: update erpnext image to v15 --- docs/setup_for_linux_mac.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index 651f67ca..8e1fb906 100644 --- a/docs/setup_for_linux_mac.md +++ b/docs/setup_for_linux_mac.md @@ -15,7 +15,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -25,7 +25,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -33,6 +33,7 @@ services: entrypoint: - bash - -c + # add redis_socketio for backward compatibility command: - > ls -1 apps > sites/apps.txt; @@ -40,6 +41,7 @@ services: bench set-config -gp db_port $$DB_PORT; bench set-config -g redis_cache "redis://$$REDIS_CACHE"; bench set-config -g redis_queue "redis://$$REDIS_QUEUE"; + bench set-config -g redis_socketio "redis://$$REDIS_QUEUE"; bench set-config -gp socketio_port $$SOCKETIO_PORT; environment: DB_HOST: db @@ -52,7 +54,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -104,8 +106,10 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 + depends_on: + - websocket deploy: restart_policy: condition: on-failure @@ -127,7 +131,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -136,13 +140,13 @@ services: - bench - worker - --queue - - long + - long,default,short volumes: - sites:/home/frappe/frappe-bench/sites - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -151,7 +155,7 @@ services: - bench - worker - --queue - - short + - short,default volumes: - sites:/home/frappe/frappe-bench/sites - logs:/home/frappe/frappe-bench/logs @@ -175,7 +179,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -188,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: