refactor: prepare for v15 (#1243)

* chore: resolve merge conflict

* ci: changes for version 15

* chore: upgrade python and nodejs

* ci: fix v15 build

* fix: add redis_socketio for backward compatibility

* ci: fix v15 build

* ci: fix test endpoint

changed to erpnext.templates.pages.search_help.get_help_results_sections
This commit is contained in:
Revant Nandgaonkar
2023-10-20 18:40:10 +05:30
committed by GitHub
parent ab5f985536
commit f605addb71
26 changed files with 79 additions and 193 deletions

View File

@@ -15,7 +15,7 @@ version: "3"
services:
backend:
image: frappe/erpnext:v14.27.1
image: frappe/erpnext:v14
platform: linux/amd64
deploy:
restart_policy:
@@ -25,7 +25,7 @@ services:
- logs:/home/frappe/frappe-bench/logs
configurator:
image: frappe/erpnext:v14.27.1
image: frappe/erpnext:v14
platform: linux/amd64
deploy:
restart_policy:
@@ -40,21 +40,19 @@ 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_SOCKETIO";
bench set-config -gp socketio_port $$SOCKETIO_PORT;
environment:
DB_HOST: db
DB_PORT: "3306"
REDIS_CACHE: redis-cache:6379
REDIS_QUEUE: redis-queue:6379
REDIS_SOCKETIO: redis-socketio:6379
SOCKETIO_PORT: "9000"
volumes:
- sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs
create-site:
image: frappe/erpnext:v14.27.1
image: frappe/erpnext:v14
platform: linux/amd64
deploy:
restart_policy:
@@ -70,7 +68,6 @@ services:
wait-for-it -t 120 db:3306;
wait-for-it -t 120 redis-cache:6379;
wait-for-it -t 120 redis-queue:6379;
wait-for-it -t 120 redis-socketio:6379;
export start=`date +%s`;
until [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".db_host // empty"` ]] && \
[[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_cache // empty"` ]] && \
@@ -107,7 +104,7 @@ services:
- db-data:/var/lib/mysql
frontend:
image: frappe/erpnext:v14.27.1
image: frappe/erpnext:v14
platform: linux/amd64
deploy:
restart_policy:
@@ -129,23 +126,8 @@ services:
ports:
- "8080:8080"
queue-default:
image: frappe/erpnext:v14.27.1
platform: linux/amd64
deploy:
restart_policy:
condition: on-failure
command:
- bench
- worker
- --queue
- default
volumes:
- sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs
queue-long:
image: frappe/erpnext:v14.27.1
image: frappe/erpnext:v14
platform: linux/amd64
deploy:
restart_policy:
@@ -160,7 +142,7 @@ services:
- logs:/home/frappe/frappe-bench/logs
queue-short:
image: frappe/erpnext:v14.27.1
image: frappe/erpnext:v14
platform: linux/amd64
deploy:
restart_policy:
@@ -192,17 +174,8 @@ services:
volumes:
- redis-cache-data:/data
redis-socketio:
image: redis:6.2-alpine
platform: linux/amd64
deploy:
restart_policy:
condition: on-failure
volumes:
- redis-socketio-data:/data
scheduler:
image: frappe/erpnext:v14.27.1
image: frappe/erpnext:v14
platform: linux/amd64
deploy:
restart_policy:
@@ -215,7 +188,7 @@ services:
- logs:/home/frappe/frappe-bench/logs
websocket:
image: frappe/erpnext:v14.27.1
image: frappe/erpnext:v14
platform: linux/amd64
deploy:
restart_policy:
@@ -231,7 +204,6 @@ volumes:
db-data:
redis-queue-data:
redis-cache-data:
redis-socketio-data:
sites:
logs:
```