From b2b15e9d561b100d677e200b7b556420118d2cdc Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Aug 2023 03:18:04 +0000 Subject: [PATCH 01/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index fe979047..c60855b0 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.33.2 +ERPNEXT_VERSION=v14.34.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f77e87a4..f493f782 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.33.2 + image: frappe/erpnext:v14.34.0 deploy: restart_policy: condition: on-failure From 84c524e4053faf9f6adadd829bfea64ba632422c Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 10 Aug 2023 08:17:46 +0000 Subject: [PATCH 02/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index c60855b0..cd438ded 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.34.0 +ERPNEXT_VERSION=v14.34.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f493f782..2f637754 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.34.0 + image: frappe/erpnext:v14.34.1 deploy: restart_policy: condition: on-failure From 5f045098feeca4399edd0b740059c1d58967e688 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 10 Aug 2023 12:40:38 +0000 Subject: [PATCH 03/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index cd438ded..22379005 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.34.1 +ERPNEXT_VERSION=v14.34.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2f637754..9e38fb89 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.34.1 + image: frappe/erpnext:v14.34.2 deploy: restart_policy: condition: on-failure From b3d807fc546e54c66e5b7295d003a40d96ac6a5d Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 11 Aug 2023 13:41:51 +0000 Subject: [PATCH 04/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 22379005..8041ef86 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.34.2 +ERPNEXT_VERSION=v14.34.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 9e38fb89..71c43dd4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.34.2 + image: frappe/erpnext:v14.34.3 deploy: restart_policy: condition: on-failure From 2e28bce3b2bd0d2d2002385b1ce9e21c91fef94c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Aug 2023 06:53:38 +0000 Subject: [PATCH 05/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 8041ef86..5ee8f321 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.34.3 +ERPNEXT_VERSION=v14.35.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 71c43dd4..0f6b1db2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.34.3 + image: frappe/erpnext:v14.35.0 deploy: restart_policy: condition: on-failure From e56d3b7c22f2577bdb231e7fab1c4d803cf390e2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 17 Aug 2023 12:45:59 +0000 Subject: [PATCH 06/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 5ee8f321..b2269cf3 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.35.0 +ERPNEXT_VERSION=v14.35.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0f6b1db2..be422349 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.35.0 + image: frappe/erpnext:v14.35.1 deploy: restart_policy: condition: on-failure From efeeb03fc6bdbda7ab8589d50c080c7f4bb2f500 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 18:54:13 +0530 Subject: [PATCH 07/69] chore(deps): Update pre-commit hooks (#1210) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a541f46c..0bf2e895 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,7 +24,7 @@ repos: - id: isort - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.1 + rev: v3.0.2 hooks: - id: prettier From aaa64a214969a1965dfe950efaeeb94de94e8f2f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 18 Aug 2023 15:42:31 +0000 Subject: [PATCH 08/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index b2269cf3..65fc9ad2 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.35.1 +ERPNEXT_VERSION=v14.35.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index be422349..a69b1b2d 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.35.1 + image: frappe/erpnext:v14.35.2 deploy: restart_policy: condition: on-failure From 05a383fd3a1bcee784d17be66daee70b8efec380 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Aug 2023 03:11:18 +0000 Subject: [PATCH 09/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 65fc9ad2..cb83612b 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.35.2 +ERPNEXT_VERSION=v14.36.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a69b1b2d..d7c8b988 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.35.2 + image: frappe/erpnext:v14.36.0 deploy: restart_policy: condition: on-failure From 8fa392fffffe6cf080d103d97949ad55b64d9fd4 Mon Sep 17 00:00:00 2001 From: "Mahmoud (Moudy) Taleb" Date: Thu, 24 Aug 2023 03:36:05 -0500 Subject: [PATCH 10/69] Add cd command for clarity (#1214) --- docs/setup_for_linux_mac.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index c805fe14..4d6f0b51 100644 --- a/docs/setup_for_linux_mac.md +++ b/docs/setup_for_linux_mac.md @@ -238,6 +238,10 @@ volumes: step3: run the docker +``` +cd frappe_docker +``` + ``` docker-compose -f ./pwd.yml up ``` From 258fec25d2a2f9849ec7be9da60d93fb97db19a0 Mon Sep 17 00:00:00 2001 From: Antony-M1 <96291963+Antony-M1@users.noreply.github.com> Date: Fri, 25 Aug 2023 21:32:37 +0530 Subject: [PATCH 11/69] 3.9.9 deprecated (#1216) * Update development.md * 3.9.9 deprecated --- docs/development.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/development.md b/docs/development.md index 1adea89c..97c07c1e 100644 --- a/docs/development.md +++ b/docs/development.md @@ -91,7 +91,7 @@ To setup frappe framework version 13 bench set `PYENV_VERSION` environment varia ```shell nvm use v14 -PYENV_VERSION=3.9.9 bench init --skip-redis-config-generation --frappe-branch version-13 frappe-bench +PYENV_VERSION=3.9.17 bench init --skip-redis-config-generation --frappe-branch version-13 frappe-bench cd frappe-bench ``` From 43ea0d5f13c252c5d4126a261a55542fb26068a4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 30 Aug 2023 14:08:10 +0000 Subject: [PATCH 12/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index cb83612b..75e7883e 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.36.0 +ERPNEXT_VERSION=v14.37.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index d7c8b988..047db9bf 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.36.0 + image: frappe/erpnext:v14.37.0 deploy: restart_policy: condition: on-failure From d29f68ff735070691d5715d3fa81ed4a228b3dbb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:03:23 +0530 Subject: [PATCH 13/69] chore(deps): Update pre-commit hooks (#1218) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0bf2e895..76771fd5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,7 +24,7 @@ repos: - id: isort - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.2 + rev: v3.0.3 hooks: - id: prettier From 514f53595574ae3b64dfd3eb3653ea3852b55462 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 31 Aug 2023 14:23:18 +0000 Subject: [PATCH 14/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 75e7883e..52de023a 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.37.0 +ERPNEXT_VERSION=v14.37.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 047db9bf..8d329bf8 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.37.0 + image: frappe/erpnext:v14.37.1 deploy: restart_policy: condition: on-failure From 16a93c94a07bf3b384bfaec1329a9e4af6004a75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 03:22:54 +0530 Subject: [PATCH 15/69] chore(deps): bump pytest from 7.4.0 to 7.4.1 (#1219) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.0 to 7.4.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.0...7.4.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 70613be0..8e716e0f 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==7.4.0 +pytest==7.4.1 From 7c6f953bd7484ef750c2b63ac1c5b288d977c2bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 03:24:07 +0530 Subject: [PATCH 16/69] chore(deps): bump actions/checkout from 3 to 4 (#1220) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 2 +- .github/workflows/build_stable.yml | 2 +- .github/workflows/docker-build-push.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/pre-commit-autoupdate.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index a3c87984..8027bfc3 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index f33832c1..ec0f7b68 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -62,7 +62,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python uses: actions/setup-python@v4 diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 2bdb363d..6d89cbc2 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -40,7 +40,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Buildx uses: docker/setup-buildx-action@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 432c9dbd..2eefea99 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python uses: actions/setup-python@v4 diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 7290563b..a8e5bf1b 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Update pre-commit hooks uses: vrslev/pre-commit-autoupdate@v1.0.0 From 252b2e12d3067ffe143bdc6a5d1be826d06648c4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Sep 2023 06:12:26 +0000 Subject: [PATCH 17/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 52de023a..06b24165 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.37.1 +ERPNEXT_VERSION=v14.38.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8d329bf8..033c82b4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.37.1 + image: frappe/erpnext:v14.38.0 deploy: restart_policy: condition: on-failure From 262e57237b5070b19193e13fb44a492939bf7bc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Sep 2023 15:23:12 +0530 Subject: [PATCH 18/69] chore(deps): bump pytest from 7.4.1 to 7.4.2 (#1221) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.1 to 7.4.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.1...7.4.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 8e716e0f..2a929edc 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==7.4.1 +pytest==7.4.2 From 405628835fca2892d5f4042842520fda55040472 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 9 Sep 2023 15:24:06 +0530 Subject: [PATCH 19/69] chore(deps): Update pre-commit hooks (#1222) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 76771fd5..09797481 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: args: [--py37-plus] - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.0 hooks: - id: black From 9e17b0ed97332690f37cda04555747e8fdf09d59 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 21:37:33 +0530 Subject: [PATCH 20/69] chore(deps): Update pre-commit hooks (#1223) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 09797481..db274101 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: args: [--py37-plus] - repo: https://github.com/psf/black - rev: 23.9.0 + rev: 23.9.1 hooks: - id: black From df19210889396f904e399e038a3978b1d154100e Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 12 Sep 2023 12:33:05 +0000 Subject: [PATCH 21/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 06b24165..fd226eec 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.38.0 +ERPNEXT_VERSION=v14.39.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 033c82b4..0187e393 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.38.0 + image: frappe/erpnext:v14.39.0 deploy: restart_policy: condition: on-failure From 1da736b4b6d34ab50869c026276e69d22a3d99a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 22:09:27 +0530 Subject: [PATCH 22/69] chore(deps): bump docker/login-action from 2 to 3 (#1224) Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 2 +- .github/workflows/docker-build-push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index 8027bfc3..b098bbd8 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -44,7 +44,7 @@ jobs: - name: Login if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 6d89cbc2..58bbcc5c 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -77,7 +77,7 @@ jobs: - name: Login if: ${{ inputs.push }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 413cea31aa9efd6caf524c85b14a30b866845566 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 22:10:06 +0530 Subject: [PATCH 23/69] chore(deps): bump docker/setup-buildx-action from 2 to 3 (#1225) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 2 +- .github/workflows/docker-build-push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index b098bbd8..da00523f 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -29,7 +29,7 @@ jobs: platforms: all - name: Setup Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Set Environment Variables run: cat example.env | grep -o '^[^#]*' >> "$GITHUB_ENV" diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 58bbcc5c..f56f3b24 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: driver-opts: network=host From 5a963bd59b091a89be5334f670bd48dc8a5c0181 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 22:10:39 +0530 Subject: [PATCH 24/69] chore(deps): bump docker/bake-action from 3.1.0 to 4.0.0 (#1226) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 3.1.0 to 4.0.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v3.1.0...v4.0.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 4 ++-- .github/workflows/docker-build-push.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index da00523f..963f7619 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -38,7 +38,7 @@ jobs: run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV" - name: Build and test - uses: docker/bake-action@v3.1.0 + uses: docker/bake-action@v4.0.0 with: targets: bench-test @@ -51,7 +51,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v3.1.0 + uses: docker/bake-action@v4.0.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index f56f3b24..a6cd5a79 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -56,7 +56,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v3.1.0 + uses: docker/bake-action@v4.0.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v3.1.0 + uses: docker/bake-action@v4.0.0 with: push: true From 1aadcf9676e3f41b9c03d3325fb738bd4c59aa59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 08:59:31 +0530 Subject: [PATCH 25/69] chore(deps): bump docker/setup-qemu-action from 2 to 3 (#1227) Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index 963f7619..bc065413 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 - name: Setup QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: image: tonistiigi/binfmt:latest platforms: all From fb2fc88cb909f817eb5a580a18a7311400d4ad86 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 17 Sep 2023 18:06:11 +0530 Subject: [PATCH 26/69] chore(deps): Update pre-commit hooks (#1228) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index db274101..ef660648 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.11.0 hooks: - id: pyupgrade args: [--py37-plus] From b4d8209c90291295dba9f5b26932382f7904f1f9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Sep 2023 06:37:00 +0000 Subject: [PATCH 27/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index fd226eec..3b8c2d5b 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.39.0 +ERPNEXT_VERSION=v14.40.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0187e393..6403a925 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.39.0 + image: frappe/erpnext:v14.40.0 deploy: restart_policy: condition: on-failure From afcc9f1aeb86c06a49ddb4ea33c3fff305e40585 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 03:10:35 +0530 Subject: [PATCH 28/69] chore(deps): Update pre-commit hooks (#1231) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ef660648..ba9572a6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.11.0 + rev: v3.11.1 hooks: - id: pyupgrade args: [--py37-plus] From bfdb0497fe4938b4663d3e46da94418126829aae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 17:43:33 +0530 Subject: [PATCH 29/69] chore(deps): Update pre-commit hooks (#1233) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ba9572a6..4ce43c70 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.11.1 + rev: v3.12.0 hooks: - id: pyupgrade args: [--py37-plus] From 051b959526986bea4bfc8f0dcd87689a63d3c50e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:29:53 +0530 Subject: [PATCH 30/69] chore(deps): Update pre-commit hooks (#1234) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4ce43c70..2a5dac78 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.12.0 + rev: v3.13.0 hooks: - id: pyupgrade args: [--py37-plus] From aa1fc53b4039940a86ad5897001619e6c2f2d63d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Sep 2023 05:51:54 +0000 Subject: [PATCH 31/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 3b8c2d5b..60052866 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.40.0 +ERPNEXT_VERSION=v14.41.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6403a925..fe14088f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.40.0 + image: frappe/erpnext:v14.41.0 deploy: restart_policy: condition: on-failure From 8b6392d655ed01af465f535737f625944f754996 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Sep 2023 07:54:13 +0000 Subject: [PATCH 32/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 60052866..154a8e66 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.41.0 +ERPNEXT_VERSION=v14.41.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index fe14088f..26773ed5 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.41.0 + image: frappe/erpnext:v14.41.1 deploy: restart_policy: condition: on-failure From f8e1a25fe016cfb7725723e525bff594ba4a6ab5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 29 Sep 2023 07:02:26 +0000 Subject: [PATCH 33/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 154a8e66..9dc94c70 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.41.1 +ERPNEXT_VERSION=v14.41.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 26773ed5..7dbdd986 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.41.1 + image: frappe/erpnext:v14.41.2 deploy: restart_policy: condition: on-failure From 040ceea2a192d531cda3fd89e99fccae8ca081f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 30 Sep 2023 12:31:08 +0530 Subject: [PATCH 34/69] chore(deps): Update pre-commit hooks (#1235) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2a5dac78..669f067e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,7 +47,7 @@ repos: types: [shell] - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.9.0.5 + rev: v0.9.0.6 hooks: - id: shellcheck args: [-x] From edb37d1686db13ad93bd2b350c1518cbed7defa0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Oct 2023 02:30:39 +0000 Subject: [PATCH 35/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 9dc94c70..a26e6d41 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.41.2 +ERPNEXT_VERSION=v14.42.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7dbdd986..c6f9a990 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.41.2 + image: frappe/erpnext:v14.42.0 deploy: restart_policy: condition: on-failure From dffe7486edb889d6457af4ae6d4ceb99e77c0639 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:06:51 +0530 Subject: [PATCH 36/69] chore(deps): Update pre-commit hooks (#1236) Co-authored-by: vrslev --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 669f067e..cc003b95 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.13.0 + rev: v3.14.0 hooks: - id: pyupgrade args: [--py37-plus] @@ -29,7 +29,7 @@ repos: - id: prettier - repo: https://github.com/codespell-project/codespell - rev: v2.2.5 + rev: v2.2.6 hooks: - id: codespell args: From d03ada509172ed5ac63f3ad1ee60e3f5c16ee3af Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Oct 2023 14:49:43 +0000 Subject: [PATCH 37/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index a26e6d41..da82d18d 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.42.0 +ERPNEXT_VERSION=v14.43.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c6f9a990..08030e06 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.42.0 + image: frappe/erpnext:v14.43.0 deploy: restart_policy: condition: on-failure From 26f921d7dc5b693b23a0ef1b1419c6ccbccc29bf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 04:02:09 +0530 Subject: [PATCH 38/69] chore(deps): Update pre-commit hooks (#1238) Co-authored-by: vrslev --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cc003b95..c7d15f1d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-executables-have-shebangs - id: check-shebang-scripts-are-executable @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.14.0 + rev: v3.15.0 hooks: - id: pyupgrade args: [--py37-plus] From 4c9b779fac340fe74943213ce71beff09928de0b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 11:27:55 +0000 Subject: [PATCH 39/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index da82d18d..85141336 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.43.0 +ERPNEXT_VERSION=v14.43.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 08030e06..ba390bec 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.43.0 + image: frappe/erpnext:v14.43.1 deploy: restart_policy: condition: on-failure From 0333e62884b706d01d38804472f71b3f6a039ff6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 12 Oct 2023 02:27:59 +0000 Subject: [PATCH 40/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 85141336..45d5efe6 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.43.1 +ERPNEXT_VERSION=v14.44.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index ba390bec..e3b6a233 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.43.1 + image: frappe/erpnext:v14.44.0 deploy: restart_policy: condition: on-failure From be174a164a283d2ae8dd971fca0db10db5652cc6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 19 Oct 2023 11:58:37 +0000 Subject: [PATCH 41/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 45d5efe6..8d60e901 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.44.0 +ERPNEXT_VERSION=v14.44.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e3b6a233..6ee21a13 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.44.0 + image: frappe/erpnext:v14.44.1 deploy: restart_policy: condition: on-failure From 7f8d7948350943220c67b8216b0c12a83cd3342b Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 20 Oct 2023 15:52:14 +0530 Subject: [PATCH 42/69] fix: sync nginx template from bench changes (#1241) --- resources/nginx-template.conf | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/resources/nginx-template.conf b/resources/nginx-template.conf index 944bce3c..0568372a 100644 --- a/resources/nginx-template.conf +++ b/resources/nginx-template.conf @@ -42,8 +42,6 @@ server { location /socket.io { proxy_http_version 1.1; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header X-Frappe-Site-Name ${FRAPPE_SITE_NAME_HEADER}; @@ -54,9 +52,9 @@ server { } location / { - rewrite ^(.+)/$ $proxy_x_forwarded_proto://${FRAPPE_SITE_NAME_HEADER}$1 permanent; - rewrite ^(.+)/index\.html$ $proxy_x_forwarded_proto://${FRAPPE_SITE_NAME_HEADER}$1 permanent; - rewrite ^(.+)\.html$ $proxy_x_forwarded_proto://${FRAPPE_SITE_NAME_HEADER}$1 permanent; + rewrite ^(.+)/$ $1 permanent; + rewrite ^(.+)/index\.html$ $1 permanent; + rewrite ^(.+)\.html$ $1 permanent; location ~ ^/files/.*.(htm|html|svg|xml) { add_header Content-disposition "attachment"; @@ -67,8 +65,9 @@ server { } location @webserver { - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Frappe-Site-Name ${FRAPPE_SITE_NAME_HEADER}; proxy_set_header Host $host; proxy_set_header X-Use-X-Accel-Redirect True; From dddb791c8130f9bf19712fee5a98d4c8cc453cad Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 20 Oct 2023 16:30:55 +0530 Subject: [PATCH 43/69] fix: sync nginx template from bench changes (#1242) --- resources/nginx-template.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/nginx-template.conf b/resources/nginx-template.conf index 0568372a..e6d796a3 100644 --- a/resources/nginx-template.conf +++ b/resources/nginx-template.conf @@ -6,12 +6,6 @@ upstream socketio-server { server ${SOCKETIO} fail_timeout=0; } -# Parse the X-Forwarded-Proto header - if set - defaulting to $scheme. -map $http_x_forwarded_proto $proxy_x_forwarded_proto { - default $scheme; - https https; -} - server { listen 8080; server_name ${FRAPPE_SITE_NAME_HEADER}; From ab5f9855366efb0fbb74562bb426917fc39dd0f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 17:33:14 +0530 Subject: [PATCH 44/69] chore(deps): Update pre-commit hooks (#1240) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c7d15f1d..af558908 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: args: [--py37-plus] - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.10.0 hooks: - id: black From f605addb71be7e47977ebca29561f075297bbdfc Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 20 Oct 2023 18:40:10 +0530 Subject: [PATCH 45/69] 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 --- .github/scripts/get_latest_tags.py | 4 +-- .github/workflows/build_develop.yml | 4 +-- .github/workflows/build_stable.yml | 36 ++++++++++---------- compose.yaml | 8 ++--- devcontainer-example/docker-compose.yml | 3 -- development/apps-example.json | 2 +- development/installer.py | 25 +++++++------- development/vscode-example/launch.json | 12 ------- docker-bake.hcl | 4 +-- docs/development.md | 10 +++--- docs/environment-variables.md | 6 +--- docs/list-of-containers.md | 2 +- docs/migrate-from-multi-image-setup.md | 3 -- docs/setup-options.md | 6 ++-- docs/setup_for_linux_mac.md | 44 +++++-------------------- docs/single-compose-setup.md | 4 +-- example.env | 1 - images/bench/Dockerfile | 27 ++++++--------- images/custom/Containerfile | 8 ++--- images/production/Containerfile | 10 +++--- overrides/compose.multi-bench.yaml | 9 ----- overrides/compose.redis.yaml | 8 ----- pwd.yml | 28 ++-------------- tests/_check_connections.py | 2 +- tests/compose.ci.yaml | 3 -- tests/test_frappe_docker.py | 3 +- 26 files changed, 79 insertions(+), 193 deletions(-) diff --git a/.github/scripts/get_latest_tags.py b/.github/scripts/get_latest_tags.py index b2e083c4..7d168bab 100644 --- a/.github/scripts/get_latest_tags.py +++ b/.github/scripts/get_latest_tags.py @@ -9,7 +9,7 @@ import sys from typing import Literal Repo = Literal["frappe", "erpnext"] -MajorVersion = Literal["12", "13", "14", "develop"] +MajorVersion = Literal["12", "13", "14", "15", "develop"] def get_latest_tag(repo: Repo, version: MajorVersion) -> str: @@ -57,7 +57,7 @@ def main(_args: list[str]) -> int: parser = argparse.ArgumentParser() parser.add_argument("--repo", choices=["frappe", "erpnext"], required=True) parser.add_argument( - "--version", choices=["12", "13", "14", "develop"], required=True + "--version", choices=["12", "13", "14", "15", "develop"], required=True ) args = parser.parse_args(_args) diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index 97ed9a88..e37c5858 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -26,8 +26,8 @@ jobs: repo: erpnext version: develop push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - python_version: 3.11.4 - node_version: 18.16.1 + python_version: 3.11.6 + node_version: 18.18.2 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index ec0f7b68..a09f70b8 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -30,26 +30,26 @@ on: workflow_dispatch: jobs: - v13: - uses: ./.github/workflows/docker-build-push.yml - with: - repo: erpnext - version: "13" - push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - python_version: 3.9.17 - node_version: 14.21.3 - secrets: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - v14: uses: ./.github/workflows/docker-build-push.yml with: repo: erpnext version: "14" push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - python_version: 3.10.12 - node_version: 16.20.1 + python_version: 3.10.13 + node_version: 16.20.2 + secrets: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + + v15: + uses: ./.github/workflows/docker-build-push.yml + with: + repo: erpnext + version: "15" + push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} + python_version: 3.11.6 + node_version: 18.18.2 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} @@ -58,7 +58,7 @@ jobs: name: Update example.env and pwd.yml runs-on: ubuntu-latest if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - needs: v14 + needs: v15 steps: - name: Checkout @@ -70,7 +70,7 @@ jobs: python-version: "3.10" - name: Get latest versions - run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 14 + run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 15 - name: Update run: | @@ -96,7 +96,7 @@ jobs: name: Release Helm runs-on: ubuntu-latest if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - needs: v14 + needs: v15 steps: - name: Setup deploy key @@ -113,4 +113,4 @@ jobs: run: | git clone git@github.com:frappe/helm.git && cd helm pip install -r release_wizard/requirements.txt - ./release_wizard/wizard 14 patch --remote origin --ci + ./release_wizard/wizard 15 patch --remote origin --ci diff --git a/compose.yaml b/compose.yaml index 10b1e663..d70590ad 100644 --- a/compose.yaml +++ b/compose.yaml @@ -20,6 +20,7 @@ services: entrypoint: - bash - -c + # add redis_socketio for backward compatibility command: - > ls -1 apps > sites/apps.txt; @@ -27,14 +28,13 @@ 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 -g redis_socketio "redis://$$REDIS_QUEUE"; bench set-config -gp socketio_port $$SOCKETIO_PORT; environment: DB_HOST: ${DB_HOST} DB_PORT: ${DB_PORT} REDIS_CACHE: ${REDIS_CACHE} REDIS_QUEUE: ${REDIS_QUEUE} - REDIS_SOCKETIO: ${REDIS_SOCKETIO} SOCKETIO_PORT: 9000 depends_on: {} @@ -72,10 +72,6 @@ services: <<: *backend_defaults command: bench worker --queue short - queue-default: - <<: *backend_defaults - command: bench worker --queue default - queue-long: <<: *backend_defaults command: bench worker --queue long diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index ea07eb3a..c2b02bc6 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -26,9 +26,6 @@ services: redis-queue: image: redis:alpine - redis-socketio: - image: redis:alpine - frappe: image: frappe/bench:latest command: sleep infinity diff --git a/development/apps-example.json b/development/apps-example.json index f73d9278..513d3d10 100644 --- a/development/apps-example.json +++ b/development/apps-example.json @@ -1,6 +1,6 @@ [ { "url": "https://github.com/frappe/erpnext.git", - "branch": "version-14" + "branch": "version-15" } ] diff --git a/development/installer.py b/development/installer.py index ad5d52c5..ed0c41ce 100755 --- a/development/installer.py +++ b/development/installer.py @@ -72,8 +72,8 @@ def get_args_parser(): "--frappe-branch", action="store", type=str, - help="frappe repo to use, default: version-14", # noqa: E501 - default="version-14", + help="frappe repo to use, default: version-15", # noqa: E501 + default="version-15", ) parser.add_argument( "-p", @@ -97,6 +97,14 @@ def get_args_parser(): action="store_true", help="verbose output", # noqa: E501 ) + parser.add_argument( + "-a", + "--admin-password", + action="store", + type=str, + help="admin password for site, default: admin", # noqa: E501 + default="admin", + ) return parser @@ -156,17 +164,6 @@ def init_bench_if_not_exist(args): ], cwd=os.getcwd() + "/" + args.bench_name, ) - cprint("Set redis_socketio to redis://redis-socketio:6379", level=3) - subprocess.call( - [ - "bench", - "set-config", - "-g", - "redis_socketio", - "redis://redis-socketio:6379", - ], - cwd=os.getcwd() + "/" + args.bench_name, - ) cprint("Set developer_mode", level=3) subprocess.call( ["bench", "set-config", "-gp", "developer_mode", "1"], @@ -182,7 +179,7 @@ def create_site_in_bench(args): "new-site", "--no-mariadb-socket", "--mariadb-root-password=123", - "--admin-password=admin", + f"--admin-password={args.admin_password}", ] apps = os.listdir(f"{os.getcwd()}/{args.bench_name}/apps") apps.remove("frappe") diff --git a/development/vscode-example/launch.json b/development/vscode-example/launch.json index 68fa9309..e3100c7a 100644 --- a/development/vscode-example/launch.json +++ b/development/vscode-example/launch.json @@ -23,18 +23,6 @@ "DEV_SERVER": "1" } }, - { - "name": "Bench Default Worker", - "type": "python", - "request": "launch", - "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", - "args": ["frappe", "worker", "--queue", "default"], - "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python", - "cwd": "${workspaceFolder}/frappe-bench/sites", - "env": { - "DEV_SERVER": "1" - } - }, { "name": "Bench Short Worker", "type": "python", diff --git a/docker-bake.hcl b/docker-bake.hcl index a217c6ea..f2a9fc70 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -6,10 +6,10 @@ variable "REGISTRY_USER" { } variable PYTHON_VERSION { - default = "3.11.4" + default = "3.11.6" } variable NODE_VERSION { - default = "18.16.1" + default = "18.18.2" } variable "FRAPPE_VERSION" { diff --git a/docs/development.md b/docs/development.md index 97c07c1e..3919b644 100644 --- a/docs/development.md +++ b/docs/development.md @@ -87,7 +87,7 @@ PYENV_VERSION=3.10.12 bench init --skip-redis-config-generation --frappe-branch cd frappe-bench ``` -To setup frappe framework version 13 bench set `PYENV_VERSION` environment variable to `3.9.9` and use NodeJS version 14, +To setup frappe framework version 13 bench set `PYENV_VERSION` environment variable to `3.9.17` and use NodeJS version 14, ```shell nvm use v14 @@ -103,7 +103,6 @@ We need to tell bench to use the right containers instead of localhost. Run the bench set-config -g db_host mariadb bench set-config -g redis_cache redis://redis-cache:6379 bench set-config -g redis_queue redis://redis-queue:6379 -bench set-config -g redis_socketio redis://redis-socketio:6379 ``` For any reason the above commands fail, set the values in `common_site_config.json` manually. @@ -112,8 +111,7 @@ For any reason the above commands fail, set the values in `common_site_config.js { "db_host": "mariadb", "redis_cache": "redis://redis-cache:6379", - "redis_queue": "redis://redis-queue:6379", - "redis_socketio": "redis://redis-socketio:6379" + "redis_queue": "redis://redis-queue:6379" } ``` @@ -236,7 +234,7 @@ Note: To start bench with debugger refer section for debugging. Most developers work with numerous clients and versions. Moreover, apps may be required to be installed by everyone on the team working for a client. -This is simplified using a script to automate the process of creating a new bench / site and installing the required apps. +This is simplified using a script to automate the process of creating a new bench / site and installing the required apps. `Administrator` password is for created sites is `admin`. Sample `apps-example.json` is used by default, it installs erpnext on current stable release. To install custom apps, copy the `apps-example.json` to custom json file and make changes to list of apps. Pass this file to the `installer.py` script. @@ -269,6 +267,8 @@ options: -n NODE_VERSION, --node-version NODE_VERSION node version, default: Not Set -v, --verbose verbose output + -a ADMIN_PASSWORD, --admin-password ADMIN_PASSWORD + admin password for site, default: admin ``` A new bench and / or site is created for the client with following defaults. diff --git a/docs/environment-variables.md b/docs/environment-variables.md index 15e61818..0101fcbd 100644 --- a/docs/environment-variables.md +++ b/docs/environment-variables.md @@ -39,11 +39,7 @@ Hostname for redis server to store cache. Set only if external service for redis ### `REDIS_QUEUE` -Hostname for redis server to store queue data. Set only if external service for redis is used. - -### `REDIS_SOCKETIO` - -Hostname for redis server to store socketio data. Set only if external service for redis is used. +Hostname for redis server to store queue data and socketio. Set only if external service for redis is used. ### `ERPNEXT_VERSION` diff --git a/docs/list-of-containers.md b/docs/list-of-containers.md index 2d33ff7a..4ccf66ee 100644 --- a/docs/list-of-containers.md +++ b/docs/list-of-containers.md @@ -30,7 +30,7 @@ All services are described in `compose.yaml` - `frontend`. [nginx](https://www.nginx.com) server that serves JS/CSS assets and routes incoming requests. - `proxy`. [Traefik](https://traefik.io/traefik/) proxy. It is here for complicated setups or HTTPS override (with `overrides/compose.https.yaml`). - `websocket`. Node server that runs [Socket.IO](https://socket.io). -- `queue-short`, `queue-default`, `queue-long`. Python servers that run job queues using [rq](https://python-rq.org). +- `queue-short`, `queue-long`. Python servers that run job queues using [rq](https://python-rq.org). - `scheduler`. Python server that runs tasks on schedule using [schedule](https://schedule.readthedocs.io/en/stable/). ## Overrides diff --git a/docs/migrate-from-multi-image-setup.md b/docs/migrate-from-multi-image-setup.md index 002b5901..093b129b 100644 --- a/docs/migrate-from-multi-image-setup.md +++ b/docs/migrate-from-multi-image-setup.md @@ -62,14 +62,12 @@ configurator: 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" # ... removed for brevity ``` @@ -95,7 +93,6 @@ create-site: 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"` ]] && \ diff --git a/docs/setup-options.md b/docs/setup-options.md index afe92ae7..1d49ceea 100644 --- a/docs/setup-options.md +++ b/docs/setup-options.md @@ -40,8 +40,7 @@ Instead of `docker compose config`, you can directly use `docker compose up` to ### Setup Frappe without proxy and external MariaDB and Redis -In this case make sure you've set `DB_HOST`, `DB_PORT`, `REDIS_CACHE`, `REDIS_QUEUE` and `REDIS_SOCKETIO` -environment variables or the `configurator` will fail. +In this case make sure you've set `DB_HOST`, `DB_PORT`, `REDIS_CACHE` and `REDIS_QUEUE` environment variables or the `configurator` will fail. ```sh # Generate YAML @@ -53,8 +52,7 @@ docker compose --project-name -f ~/gitops/docker-compose.yml up - ### Setup ERPNext with proxy and external MariaDB and Redis -In this case make sure you've set `DB_HOST`, `DB_PORT`, `REDIS_CACHE`, `REDIS_QUEUE` and `REDIS_SOCKETIO` -environment variables or the `configurator` will fail. +In this case make sure you've set `DB_HOST`, `DB_PORT`, `REDIS_CACHE` and `REDIS_QUEUE` environment variables or the `configurator` will fail. ```sh # Generate YAML diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index 4d6f0b51..b8718fb4 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.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: ``` diff --git a/docs/single-compose-setup.md b/docs/single-compose-setup.md index 59bf4312..c489d102 100644 --- a/docs/single-compose-setup.md +++ b/docs/single-compose-setup.md @@ -8,7 +8,6 @@ This setup is a very simple single compose file that does everything to start re - backend, serves gunicorn backend - frontend, serves static assets through nginx frontend reverse proxies websocket and gunicorn. -- queue-default, default rq worker. - queue-long, long rq worker. - queue-short, short rq worker. - schedule, event scheduler. @@ -23,8 +22,7 @@ This setup is a very simple single compose file that does everything to start re - db, mariadb, container with frappe specific configuration. - redis-cache, redis for cache data. -- redis-queue, redis for rq data. -- redis-socketio, redis for socketio pubsub. +- redis-queue, redis for rq data and pub/sub. ## Volumes diff --git a/example.env b/example.env index 8d60e901..13c3c290 100644 --- a/example.env +++ b/example.env @@ -11,7 +11,6 @@ DB_PORT= # Only if you use external Redis REDIS_CACHE= REDIS_QUEUE= -REDIS_SOCKETIO= # Only with HTTPS override LETSENCRYPT_EMAIL=mail@example.com diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index cc5ade6e..291e4256 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -95,21 +95,18 @@ USER frappe WORKDIR /home/frappe # Install Python via pyenv -ENV PYTHON_VERSION_V13=3.9.17 -ENV PYTHON_VERSION_DEVELOP=3.11.4 -ENV PYTHON_VERSION=3.10.12 +ENV PYTHON_VERSION_V14=3.10.13 +ENV PYTHON_VERSION=3.11.6 ENV PYENV_ROOT /home/frappe/.pyenv ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH # From https://github.com/pyenv/pyenv#basic-github-checkout RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \ - && pyenv install $PYTHON_VERSION_V13 \ - && pyenv install $PYTHON_VERSION_DEVELOP \ + && pyenv install $PYTHON_VERSION_V14 \ && pyenv install $PYTHON_VERSION \ - && PYENV_VERSION=$PYTHON_VERSION_V13 pip install --no-cache-dir virtualenv \ - && PYENV_VERSION=$PYTHON_VERSION_DEVELOP pip install --no-cache-dir virtualenv \ + && PYENV_VERSION=$PYTHON_VERSION_V14 pip install --no-cache-dir virtualenv \ && PYENV_VERSION=$PYTHON_VERSION pip install --no-cache-dir virtualenv \ - && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v13 \ + && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v14 \ && sed -Ei -e '/^([^#]|$)/ {a export PYENV_ROOT="/home/frappe/.pyenv" a export PATH="$PYENV_ROOT/bin:$PATH" a ' -e ':a' -e '$!{n;ba};}' ~/.profile \ && echo 'eval "$(pyenv init --path)"' >>~/.profile \ && echo 'eval "$(pyenv init -)"' >>~/.bashrc @@ -125,19 +122,15 @@ RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \ && echo "export BENCH_DEVELOPER=1" >>/home/frappe/.bashrc # Install Node via nvm -ENV NODE_VERSION_13=14.21.3 -ENV NODE_VERSION_DEVELOP=18.12.0 -ENV NODE_VERSION=16.20.1 +ENV NODE_VERSION_14=16.20.2 +ENV NODE_VERSION=18.18.2 ENV NVM_DIR /home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} -RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \ +RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \ && . ${NVM_DIR}/nvm.sh \ - && nvm install ${NODE_VERSION_13} \ - && nvm use v${NODE_VERSION_13} \ - && npm install -g yarn \ - && nvm install ${NODE_VERSION_DEVELOP} \ - && nvm use v${NODE_VERSION_DEVELOP} \ + && nvm install ${NODE_VERSION_14} \ + && nvm use v${NODE_VERSION_14} \ && npm install -g yarn \ && nvm install ${NODE_VERSION} \ && nvm use v${NODE_VERSION} \ diff --git a/images/custom/Containerfile b/images/custom/Containerfile index e9200833..9aeecaa8 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.11.4 +ARG PYTHON_VERSION=3.11.6 ARG DEBIAN_BASE=bookworm FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base @@ -7,7 +7,7 @@ COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm -ARG NODE_VERSION=18.16.1 +ARG NODE_VERSION=18.18.2 ENV NVM_DIR=/home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -36,7 +36,7 @@ RUN useradd -ms /bin/bash frappe \ jq \ # NodeJS && mkdir -p ${NVM_DIR} \ - && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash \ + && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \ && . ${NVM_DIR}/nvm.sh \ && nvm install ${NODE_VERSION} \ && nvm use v${NODE_VERSION} \ @@ -103,7 +103,7 @@ RUN if [ -n "${APPS_JSON_BASE64}" ]; then \ USER frappe -ARG FRAPPE_BRANCH=version-14 +ARG FRAPPE_BRANCH=version-15 ARG FRAPPE_PATH=https://github.com/frappe/frappe RUN export APP_INSTALL_ARGS="" && \ if [ -n "${APPS_JSON_BASE64}" ]; then \ diff --git a/images/production/Containerfile b/images/production/Containerfile index 2add02a0..ac5d77af 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -1,10 +1,10 @@ -ARG PYTHON_VERSION=3.11.4 +ARG PYTHON_VERSION=3.11.6 ARG DEBIAN_BASE=bookworm FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm -ARG NODE_VERSION=18.16.1 +ARG NODE_VERSION=18.18.2 ENV NVM_DIR=/home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -33,7 +33,7 @@ RUN useradd -ms /bin/bash frappe \ jq \ # NodeJS && mkdir -p ${NVM_DIR} \ - && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash \ + && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \ && . ${NVM_DIR}/nvm.sh \ && nvm install ${NODE_VERSION} \ && nvm use v${NODE_VERSION} \ @@ -95,10 +95,10 @@ RUN apt-get update \ USER frappe -ARG FRAPPE_BRANCH=version-14 +ARG FRAPPE_BRANCH=version-15 ARG FRAPPE_PATH=https://github.com/frappe/frappe ARG ERPNEXT_REPO=https://github.com/frappe/erpnext -ARG ERPNEXT_BRANCH=version-14 +ARG ERPNEXT_BRANCH=version-15 RUN bench init \ --frappe-branch=${FRAPPE_BRANCH} \ --frappe-path=${FRAPPE_PATH} \ diff --git a/overrides/compose.multi-bench.yaml b/overrides/compose.multi-bench.yaml index 0e91a2f8..7e681a18 100644 --- a/overrides/compose.multi-bench.yaml +++ b/overrides/compose.multi-bench.yaml @@ -26,10 +26,6 @@ services: networks: - bench-network - mariadb-network - queue-default: - networks: - - bench-network - - mariadb-network queue-short: networks: - bench-network @@ -48,11 +44,6 @@ services: - bench-network - mariadb-network - redis-socketio: - networks: - - bench-network - - mariadb-network - networks: traefik-public: external: true diff --git a/overrides/compose.redis.yaml b/overrides/compose.redis.yaml index 2be6386d..1c625247 100644 --- a/overrides/compose.redis.yaml +++ b/overrides/compose.redis.yaml @@ -3,11 +3,9 @@ services: environment: REDIS_CACHE: redis-cache:6379 REDIS_QUEUE: redis-queue:6379 - REDIS_SOCKETIO: redis-socketio:6379 depends_on: - redis-cache - redis-queue - - redis-socketio redis-cache: image: redis:6.2-alpine @@ -19,12 +17,6 @@ services: volumes: - redis-queue-data:/data - redis-socketio: - image: redis:6.2-alpine - volumes: - - redis-socketio-data:/data - volumes: redis-cache-data: redis-queue-data: - redis-socketio-data: diff --git a/pwd.yml b/pwd.yml index 6ee21a13..238a3fda 100644 --- a/pwd.yml +++ b/pwd.yml @@ -18,6 +18,7 @@ services: entrypoint: - bash - -c + # add redis_socketio for backward compatibility command: - > ls -1 apps > sites/apps.txt; @@ -25,14 +26,13 @@ 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 -g redis_socketio "redis://$$REDIS_QUEUE"; 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 @@ -54,7 +54,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"` ]] && \ @@ -111,20 +110,6 @@ services: ports: - "8080:8080" - queue-default: - image: frappe/erpnext:v14.44.1 - 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.44.1 deploy: @@ -169,14 +154,6 @@ services: volumes: - redis-cache-data:/data - redis-socketio: - image: redis:6.2-alpine - deploy: - restart_policy: - condition: on-failure - volumes: - - redis-socketio-data:/data - scheduler: image: frappe/erpnext:v14.44.1 deploy: @@ -205,6 +182,5 @@ volumes: db-data: redis-queue-data: redis-cache-data: - redis-socketio-data: sites: logs: diff --git a/tests/_check_connections.py b/tests/_check_connections.py index e54d3b95..85ce87fc 100644 --- a/tests/_check_connections.py +++ b/tests/_check_connections.py @@ -31,7 +31,7 @@ def get_redis_url(addr: str) -> Address: def get_addresses(config: dict[str, Any]) -> Iterable[Address]: yield (config["db_host"], config["db_port"]) - for key in ("redis_cache", "redis_queue", "redis_socketio"): + for key in ("redis_cache", "redis_queue"): yield get_redis_url(config[key]) diff --git a/tests/compose.ci.yaml b/tests/compose.ci.yaml index 156c9018..81c952a5 100644 --- a/tests/compose.ci.yaml +++ b/tests/compose.ci.yaml @@ -14,9 +14,6 @@ services: queue-short: image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION} - queue-default: - image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION} - queue-long: image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION} diff --git a/tests/test_frappe_docker.py b/tests/test_frappe_docker.py index e8fcad0d..85e6f1e8 100644 --- a/tests/test_frappe_docker.py +++ b/tests/test_frappe_docker.py @@ -10,7 +10,6 @@ from tests.utils import Compose, check_url_content BACKEND_SERVICES = ( "backend", "queue-short", - "queue-default", "queue-long", "scheduler", ) @@ -127,7 +126,7 @@ class TestErpnext: ("url", "callback"), ( ( - "/api/method/erpnext.templates.pages.product_search.get_product_list", + "/api/method/erpnext.templates.pages.search_help.get_help_results_sections?text=help", api_cb, ), ("/assets/erpnext/js/setup_wizard.js", assets_cb), From 1d17e8f7522c95a1334c68331b5e5ea45f19470a Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 20 Oct 2023 13:47:22 +0000 Subject: [PATCH 46/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 13c3c290..607084f9 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.44.1 +ERPNEXT_VERSION=v15.0.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 238a3fda..f643efe0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.44.1 + image: frappe/erpnext:v15.0.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.44.1 + image: frappe/erpnext:v15.0.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.44.1 + image: frappe/erpnext:v15.0.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.44.1 + image: frappe/erpnext:v15.0.0 deploy: restart_policy: condition: on-failure @@ -111,7 +111,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v14.44.1 + image: frappe/erpnext:v15.0.0 deploy: restart_policy: condition: on-failure @@ -125,7 +125,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.44.1 + image: frappe/erpnext:v15.0.0 deploy: restart_policy: condition: on-failure @@ -155,7 +155,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v14.44.1 + image: frappe/erpnext:v15.0.0 deploy: restart_policy: condition: on-failure @@ -167,7 +167,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.44.1 + image: frappe/erpnext:v15.0.0 deploy: restart_policy: condition: on-failure From cc326b625aaa0fe6c4d0e4eb1cc5cab2822892c1 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 22 Oct 2023 14:24:52 +0530 Subject: [PATCH 47/69] fix: installer.py compatible with v14 (#1244) --- development/installer.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/development/installer.py b/development/installer.py index ed0c41ce..34686051 100755 --- a/development/installer.py +++ b/development/installer.py @@ -164,6 +164,20 @@ def init_bench_if_not_exist(args): ], cwd=os.getcwd() + "/" + args.bench_name, ) + cprint( + "Set redis_socketio to redis://redis-queue:6379 for backward compatibility", # noqa: E501 + level=3, + ) + subprocess.call( + [ + "bench", + "set-config", + "-g", + "redis_socketio", + "redis://redis-queue:6379", + ], + cwd=os.getcwd() + "/" + args.bench_name, + ) cprint("Set developer_mode", level=3) subprocess.call( ["bench", "set-config", "-gp", "developer_mode", "1"], @@ -188,6 +202,7 @@ def create_site_in_bench(args): new_site_cmd.append(args.site_name) + cprint(f"Creating Site {args.site_name} ...", level=2) subprocess.call( new_site_cmd, cwd=os.getcwd() + "/" + args.bench_name, From ebf3df296ff69dab59d068c352ce12da4f924b3c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 01:42:43 +0530 Subject: [PATCH 48/69] chore(deps): Update pre-commit hooks (#1246) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af558908..201ee45a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: args: [--py37-plus] - repo: https://github.com/psf/black - rev: 23.10.0 + rev: 23.10.1 hooks: - id: black From 839d44d167abe522f5ad4b5ef6747404c47baaa5 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 25 Oct 2023 10:51:30 +0530 Subject: [PATCH 49/69] fix: consume default queue (#1249) --- compose.yaml | 4 ++-- docs/development.md | 3 +-- docs/single-compose-setup.md | 4 ++-- pwd.yml | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/compose.yaml b/compose.yaml index d70590ad..75baa6b6 100644 --- a/compose.yaml +++ b/compose.yaml @@ -70,11 +70,11 @@ services: queue-short: <<: *backend_defaults - command: bench worker --queue short + command: bench worker --queue short,default queue-long: <<: *backend_defaults - command: bench worker --queue long + command: bench worker --queue long,default,short scheduler: <<: *backend_defaults diff --git a/docs/development.md b/docs/development.md index 3919b644..abe8d8d8 100644 --- a/docs/development.md +++ b/docs/development.md @@ -293,8 +293,7 @@ honcho start \ watch \ schedule \ worker_short \ - worker_long \ - worker_default + worker_long ``` Alternatively you can use the VSCode launch configuration "Honcho SocketIO Watch Schedule Worker" which launches the same command as above. diff --git a/docs/single-compose-setup.md b/docs/single-compose-setup.md index c489d102..aea2914c 100644 --- a/docs/single-compose-setup.md +++ b/docs/single-compose-setup.md @@ -8,8 +8,8 @@ This setup is a very simple single compose file that does everything to start re - backend, serves gunicorn backend - frontend, serves static assets through nginx frontend reverse proxies websocket and gunicorn. -- queue-long, long rq worker. -- queue-short, short rq worker. +- queue-long, long default and short rq worker. +- queue-short, default and short rq worker. - schedule, event scheduler. - websocket, socketio websocket for realtime communication. diff --git a/pwd.yml b/pwd.yml index f643efe0..fb1cd05e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -119,7 +119,7 @@ services: - bench - worker - --queue - - long + - long,default,short volumes: - sites:/home/frappe/frappe-bench/sites - logs:/home/frappe/frappe-bench/logs @@ -133,7 +133,7 @@ services: - bench - worker - --queue - - short + - short,default volumes: - sites:/home/frappe/frappe-bench/sites - logs:/home/frappe/frappe-bench/logs From 122927662c6d45c8c0693518462866dc980111da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 15:26:01 +0530 Subject: [PATCH 50/69] chore(deps): bump pytest from 7.4.2 to 7.4.3 (#1251) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.2 to 7.4.3. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.4.2...7.4.3) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 2a929edc..f9708e4b 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==7.4.2 +pytest==7.4.3 From ead5438ebb69dae6ea0b9836304627ead380f68b Mon Sep 17 00:00:00 2001 From: varun-krishnamurthy <128337350+varun-krishnamurthy@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:05:31 +1100 Subject: [PATCH 51/69] Cypress UI Test service and updates to installer.py (#1250) * #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer * #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer * #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer * #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer * #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer * #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer * #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer --- devcontainer-example/docker-compose.yml | 38 +++++++-- development/installer.py | 60 ++++++++++---- docs/development.md | 32 +++++++- install_x11_deps.sh | 104 ++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 24 deletions(-) create mode 100755 install_x11_deps.sh diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index c2b02bc6..c73dd066 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.7" services: mariadb: - image: mariadb:10.6 + image: docker.io/mariadb:10.6 command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci @@ -21,13 +21,13 @@ services: # - postgresql-data:/var/lib/postgresql/data redis-cache: - image: redis:alpine + image: docker.io/redis:alpine redis-queue: - image: redis:alpine + image: docker.io/redis:alpine frappe: - image: frappe/bench:latest + image: docker.io/frappe/bench:latest command: sleep infinity environment: - SHELL=/bin/bash @@ -39,7 +39,33 @@ services: ports: - 8000-8005:8000-8005 - 9000-9005:9000-9005 - + # enable the below service if you need Cypress UI Tests to be executed + # Before enabling ensure install_x11_deps.sh has been executed and display variable is exported. + # Run install_x11_deps.sh again if DISPLAY is not set + # ui-tester: + # # pass custom command to start Cypress otherwise it will use the entrypoint + # # specified in the Cypress Docker image. + # # also pass "--project " so that when Cypress opens + # # it can find file "cypress.json" and show integration specs + # # https://on.cypress.io/command-line#cypress-open + # entrypoint: 'sleep infinity' + # image: "docker.io/cypress/included:latest" + # environment: + # - SHELL=/bin/bash + # # get the IP address of the host machine and allow X11 to accept + # # incoming connections from that IP address + # # IP=$(ipconfig getifaddr en0) or mac or \ + # # IP=$($(hostname -I | awk '{print $1}') ) for Ubuntu + # # /usr/X11/bin/xhost + $IP + # # then pass the environment variable DISPLAY to show Cypress GUI on the host system + # # DISPLAY=$IP:0 + # - DISPLAY + # volumes: + # # for Cypress to communicate with the X11 server pass this socket file + # # in addition to any other mapped volumes + # - /tmp/.X11-unix:/tmp/.X11-unix + # - ..:/workspace:z,cached + # network_mode: "host" volumes: mariadb-data: - postgresql-data: + #postgresql-data: diff --git a/development/installer.py b/development/installer.py index 34686051..44aca431 100755 --- a/development/installer.py +++ b/development/installer.py @@ -105,6 +105,14 @@ def get_args_parser(): help="admin password for site, default: admin", # noqa: E501 default="admin", ) + parser.add_argument( + "-d", + "--db-type", + action="store", + type=str, + help="Database type to use (e.g., mariadb or postgres)", + default="mariadb", # Set your default database type here + ) return parser @@ -112,7 +120,6 @@ def init_bench_if_not_exist(args): if os.path.exists(args.bench_name): cprint("Bench already exists. Only site will be created", level=3) return - try: env = os.environ.copy() if args.py_version: @@ -137,11 +144,14 @@ def init_bench_if_not_exist(args): ] subprocess.call(command, env=env, cwd=os.getcwd()) cprint("Configuring Bench ...", level=2) - cprint("Set db_host to mariadb", level=3) - subprocess.call( - ["bench", "set-config", "-g", "db_host", "mariadb"], - cwd=os.getcwd() + "/" + args.bench_name, - ) + cprint("Set db_host", level=3) + if args.db_type: + cprint(f"Setting db_type to {args.db_type}", level=3) + subprocess.call( + ["bench", "set-config", "-g", "db_type", args.db_type], + cwd=os.path.join(os.getcwd(), args.bench_name), + ) + cprint("Set redis_cache to redis://redis-cache:6379", level=3) subprocess.call( [ @@ -188,20 +198,40 @@ def init_bench_if_not_exist(args): def create_site_in_bench(args): - new_site_cmd = [ - "bench", - "new-site", - "--no-mariadb-socket", - "--mariadb-root-password=123", - f"--admin-password={args.admin_password}", - ] + if "mariadb" == args.db_type: + cprint("Set db_host", level=3) + subprocess.call( + ["bench", "set-config", "-g", "db_host", "mariadb"], + cwd=os.getcwd() + "/" + args.bench_name, + ) + new_site_cmd = [ + "bench", + "new-site", + f"--db-host=mariadb", # Should match the compose service name + f"--db-type={args.db_type}", # Add the selected database type + f"--no-mariadb-socket", + f"--db-root-password=123", # Replace with your MariaDB password + f"--admin-password={args.admin_password}", + ] + else: + cprint("Set db_host", level=3) + subprocess.call( + ["bench", "set-config", "-g", "db_host", "postgresql"], + cwd=os.getcwd() + "/" + args.bench_name, + ) + new_site_cmd = [ + "bench", + "new-site", + f"--db-host=postgresql", # Should match the compose service name + f"--db-type={args.db_type}", # Add the selected database type + f"--db-root-password=123", # Replace with your PostgreSQL password + f"--admin-password={args.admin_password}", + ] apps = os.listdir(f"{os.getcwd()}/{args.bench_name}/apps") apps.remove("frappe") for app in apps: new_site_cmd.append(f"--install-app={app}") - new_site_cmd.append(args.site_name) - cprint(f"Creating Site {args.site_name} ...", level=2) subprocess.call( new_site_cmd, diff --git a/docs/development.md b/docs/development.md index abe8d8d8..8ea203aa 100644 --- a/docs/development.md +++ b/docs/development.md @@ -241,14 +241,14 @@ Sample `apps-example.json` is used by default, it installs erpnext on current st > You may have apps in private repos which may require ssh access. You may use SSH from your home directory on linux (configurable in docker-compose.yml). ```shell -python installer.py +python installer.py #pass --db-type postgres for postgresdb ``` For command help ```shell python installer.py --help -usage: installer.py [-h] [-j APPS_JSON] [-b BENCH_NAME] [-s SITE_NAME] [-r FRAPPE_REPO] [-t FRAPPE_BRANCH] [-p PY_VERSION] [-n NODE_VERSION] [-v] +usage: installer.py [-h] [-j APPS_JSON] [-b BENCH_NAME] [-s SITE_NAME] [-r FRAPPE_REPO] [-t FRAPPE_BRANCH] [-p PY_VERSION] [-n NODE_VERSION] [-v] [-a ADMIN_PASSWORD] [-d DB_TYPE] options: -h, --help show this help message and exit @@ -261,7 +261,7 @@ options: -r FRAPPE_REPO, --frappe-repo FRAPPE_REPO frappe repo to use, default: https://github.com/frappe/frappe -t FRAPPE_BRANCH, --frappe-branch FRAPPE_BRANCH - frappe repo to use, default: version-14 + frappe repo to use, default: version-15 -p PY_VERSION, --py-version PY_VERSION python version, default: Not Set -n NODE_VERSION, --node-version NODE_VERSION @@ -269,6 +269,8 @@ options: -v, --verbose verbose output -a ADMIN_PASSWORD, --admin-password ADMIN_PASSWORD admin password for site, default: admin + -d DB_TYPE, --db-type DB_TYPE + Database type to use (e.g., mariadb or postgres) ``` A new bench and / or site is created for the client with following defaults. @@ -276,6 +278,8 @@ A new bench and / or site is created for the client with following defaults. - MariaDB root password: `123` - Admin password: `admin` +> To use Postegres DB, comment the mariabdb service and uncomment postegres service. + ### Start Frappe with Visual Studio Code Python Debugging To enable Python debugging inside Visual Studio Code, you must first install the `ms-python.python` extension inside the container. This should have already happened automatically, but depending on your VSCode config, you can force it by: @@ -380,3 +384,25 @@ volumes: ``` Access the service by service name from the `frappe` development container. The above service will be accessible via hostname `postgresql`. If ports are published on to host, access it via `localhost:5432`. + +## Using Cypress UI tests + +To run cypress based UI tests in a docker environment, follow the below steps: + +1. Install and setup X11 tooling on VM using the script `install_x11_deps.sh` + +```shell + sudo bash ./install_x11_deps.sh +``` + +This script will install required deps, enable X11Forwarding and restart SSH daemon and export `DISPLAY` variable. + +2. Run X11 service `startx` or `xquartz` +3. Start docker compose services. +4. SSH into ui-tester service using `docker exec..` command +5. Export CYPRESS_baseUrl and other required env variables +6. Start Cypress UI console by issuing `cypress run command` + +> More references : [Cypress Official Documentation](https://www.cypress.io/blog/2019/05/02/run-cypress-with-a-single-docker-command) + +> Ensure DISPLAY environment is always exported. diff --git a/install_x11_deps.sh b/install_x11_deps.sh new file mode 100755 index 00000000..a66b2042 --- /dev/null +++ b/install_x11_deps.sh @@ -0,0 +1,104 @@ +#!/bin/bash +set -e +# This script configures X11 forwarding for Linux and macOS systems. +# It installs X11, Openbox (on Linux), and checks for XQuartz (on macOS). +# It also updates the sshd_config file to enable X11Forwarding and restarts the SSH service. + +# Check if the script is running with root privileges +if [ "$EUID" -ne 0 ]; then + echo "Error: This script requires root privileges. Please run it as a superuser" + exit 1 +fi + +# Function to restart SSH service (Linux) +restart_ssh_linux() { + if command -v service >/dev/null 2>&1; then + sudo service ssh restart + else + sudo systemctl restart ssh + fi +} + +# Function to restart SSH service (macOS) +restart_ssh_macos() { + launchctl stop com.openssh.sshd + launchctl start com.openssh.sshd +} + +update_x11_forwarding() { + if grep -q "X11Forwarding yes" /etc/ssh/sshd_config; then + echo "X11Forwarding is already set to 'yes' in ssh_config." + else + if [[ "$OSTYPE" == "linux-gnu" ]]; then + # Linux: Use sed for Linux + sudo sed -i 's/#\?X11Forwarding.*/X11Forwarding yes/' /etc/ssh/sshd_config + elif [[ "$OSTYPE" == "darwin"* ]]; then + # macOS: Use sed for macOS + sudo sed -i -E 's/#X11Forwarding.*/X11Forwarding yes/' /etc/ssh/sshd_config + restart_ssh_macos + fi + if [[ "$OSTYPE" == "linux-gnu" ]]; then + restart_ssh_linux + fi + fi +} + +# Determine the operating system +if [[ "$OSTYPE" == "linux-gnu" ]]; then + # Linux + if command -v startx >/dev/null 2>&1; then + echo "X11 is already installed." + else + # Check which package manager is available + if command -v apt-get >/dev/null 2>&1; then + install_command="sudo apt-get update && sudo apt-get install xorg openbox" + elif command -v dnf >/dev/null 2>&1; then + install_command="sudo dnf install xorg-x11-server-Xorg openbox" + else + echo "Error: Unable to determine the package manager. Manual installation required." + exit 1 + fi + fi + # Check if the installation command is defined + if [ -n "$install_command" ]; then + # Execute the installation command + if $install_command; then + echo "X11 and Openbox have been successfully installed." + else + echo "Error: Failed to install X11 and Openbox." + exit 1 + fi + else + echo "Error: Unsupported package manager." + exit 1 + fi + + # Call the function to update X11Forwarding + update_x11_forwarding + + # Get the IP address of the host dynamically + host_ip=$(hostname -I | awk '{print $1}') + xhost + "$host_ip" && xhost + local: + # Set the DISPLAY variable to the host IP + export DISPLAY="$host_ip:0.0" + echo "DISPLAY variable set to $DISPLAY" + +elif [[ "$OSTYPE" == "darwin"* ]]; then + # macOS + if command -v xquartz >/dev/null 2>&1; then + echo "XQuartz is already installed." + else + echo "Error: XQuartz is required for X11 forwarding on macOS. Please install XQuartz manually." + exit 1 + fi + + # Call the function to update X11Forwarding + update_x11_forwarding + + # Export the DISPLAY variable for macOS + export DISPLAY=:0 + echo "DISPLAY variable set to $DISPLAY" +else + echo "Error: Unsupported operating system." + exit 1 +fi From 2e99af1a3f8260704be65c49cbdccb8fb7ec2b0a Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 30 Oct 2023 11:45:55 +0530 Subject: [PATCH 52/69] fix: new-site command (#1260) fix command usage and docs fixes issue#1256 --- docs/development.md | 8 ++++---- docs/migrate-from-multi-image-setup.md | 2 +- docs/setup_for_linux_mac.md | 2 +- docs/single-server-example.md | 8 ++++---- docs/site-operations.md | 4 ++-- pwd.yml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/development.md b/docs/development.md index 8ea203aa..e2c05ace 100644 --- a/docs/development.md +++ b/docs/development.md @@ -140,7 +140,7 @@ sed -i '/redis/d' ./Procfile You can create a new site with the following command: ```shell -bench new-site sitename --no-mariadb-socket +bench new-site --no-mariadb-socket sitename ``` sitename MUST end with .localhost for trying deployments locally. @@ -148,13 +148,13 @@ sitename MUST end with .localhost for trying deployments locally. for example: ```shell -bench new-site development.localhost --no-mariadb-socket +bench new-site --no-mariadb-socket development.localhost ``` The same command can be run non-interactively as well: ```shell -bench new-site development.localhost --mariadb-root-password 123 --admin-password admin --no-mariadb-socket +bench new-site --mariadb-root-password 123 --admin-password admin --no-mariadb-socket development.localhost ``` The command will ask the MariaDB root password. The default root password is `123`. @@ -167,7 +167,7 @@ To setup site with PostgreSQL as database use option `--db-type postgres` and `- Example: ```shell -bench new-site mypgsql.localhost --db-type postgres --db-host postgresql +bench new-site --db-type postgres --db-host postgresql mypgsql.localhost ``` To avoid entering postgresql username and root password, set it in `common_site_config.json`, diff --git a/docs/migrate-from-multi-image-setup.md b/docs/migrate-from-multi-image-setup.md index 093b129b..79072b0d 100644 --- a/docs/migrate-from-multi-image-setup.md +++ b/docs/migrate-from-multi-image-setup.md @@ -106,7 +106,7 @@ create-site: fi done; echo "sites/common_site_config.json found"; - bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default; + bench new-site --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; # ... removed for brevity ``` diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index b8718fb4..651f67ca 100644 --- a/docs/setup_for_linux_mac.md +++ b/docs/setup_for_linux_mac.md @@ -81,7 +81,7 @@ services: fi done; echo "sites/common_site_config.json found"; - bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default; + bench new-site --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; db: image: mariadb:10.6 diff --git a/docs/single-server-example.md b/docs/single-server-example.md index 1b617109..4176f61e 100644 --- a/docs/single-server-example.md +++ b/docs/single-server-example.md @@ -175,7 +175,7 @@ Create sites `one.example.com` and `two.example.com`: ```shell # one.example.com docker compose --project-name erpnext-one exec backend \ - bench new-site one.example.com --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit + bench new-site --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit one.example.com ``` You can stop here and have a single bench single site setup complete. Continue to add one more site to the current bench. @@ -183,7 +183,7 @@ You can stop here and have a single bench single site setup complete. Continue t ```shell # two.example.com docker compose --project-name erpnext-one exec backend \ - bench new-site two.example.com --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit + bench new-site --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit two.example.com ``` #### Create second bench @@ -234,10 +234,10 @@ Create sites `three.example.com` and `four.example.com`: ```shell # three.example.com docker compose --project-name erpnext-two exec backend \ - bench new-site three.example.com --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit + bench new-site --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit three.example.com # four.example.com docker compose --project-name erpnext-two exec backend \ - bench new-site four.example.com --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit + bench new-site --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit four.example.com ``` #### Create custom domain to existing site diff --git a/docs/site-operations.md b/docs/site-operations.md index fc81add4..793dfef5 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -9,7 +9,7 @@ Note: - Wait for the `db` service to start and `configurator` to exit before trying to create a new site. Usually this takes up to 10 seconds. ```sh -docker-compose exec backend bench new-site --no-mariadb-socket --mariadb-root-password --admin-password +docker-compose exec backend bench new-site --no-mariadb-socket --mariadb-root-password --admin-password ``` If you need to install some app, specify `--install-app`. To see all options, just run `bench new-site --help`. @@ -24,7 +24,7 @@ docker-compose exec backend bench set-config -g root_password Also command is slightly different: ```sh -docker-compose exec backend bench new-site --no-mariadb-socket --db-type postgres --admin-password +docker-compose exec backend bench new-site --no-mariadb-socket --db-type postgres --admin-password ``` ## Push backup to S3 storage diff --git a/pwd.yml b/pwd.yml index fb1cd05e..e43d2c10 100644 --- a/pwd.yml +++ b/pwd.yml @@ -67,7 +67,7 @@ services: fi done; echo "sites/common_site_config.json found"; - bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default; + bench new-site --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; db: image: mariadb:10.6 From 27361b750022eb1f0721089415f8082b48ea8866 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 30 Oct 2023 11:56:22 +0530 Subject: [PATCH 53/69] docs: set-config for redis_socketio during development (#1261) --- docs/development.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/development.md b/docs/development.md index e2c05ace..d70a576f 100644 --- a/docs/development.md +++ b/docs/development.md @@ -103,6 +103,7 @@ We need to tell bench to use the right containers instead of localhost. Run the bench set-config -g db_host mariadb bench set-config -g redis_cache redis://redis-cache:6379 bench set-config -g redis_queue redis://redis-queue:6379 +bench set-config -g redis_socketio redis://redis-queue:6379 ``` For any reason the above commands fail, set the values in `common_site_config.json` manually. @@ -111,7 +112,8 @@ For any reason the above commands fail, set the values in `common_site_config.js { "db_host": "mariadb", "redis_cache": "redis://redis-cache:6379", - "redis_queue": "redis://redis-queue:6379" + "redis_queue": "redis://redis-queue:6379", + "redis_socketio": "redis://redis-queue:6379" } ``` From f2dc0e8f6aaed263af418e082e21510c3d545167 Mon Sep 17 00:00:00 2001 From: keerthana <86115511+keerthanamuruge@users.noreply.github.com> Date: Mon, 30 Oct 2023 20:27:31 +0530 Subject: [PATCH 54/69] PYENV_VERSION=3.10.12 Deprecated (#1262) The PYENV_VERSION 3.10.12 is deprecated the new version 3.10.13 was launched. here the reference link https://hub.docker.com/_/python --- docs/development.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/development.md b/docs/development.md index d70a576f..27d0eecc 100644 --- a/docs/development.md +++ b/docs/development.md @@ -82,7 +82,7 @@ To setup frappe framework version 14 bench set `PYENV_VERSION` environment varia bench init --skip-redis-config-generation --frappe-branch version-14 frappe-bench # Or set environment versions explicitly nvm use v16 -PYENV_VERSION=3.10.12 bench init --skip-redis-config-generation --frappe-branch version-14 frappe-bench +PYENV_VERSION=3.10.13 bench init --skip-redis-config-generation --frappe-branch version-14 frappe-bench # Switch directory cd frappe-bench ``` From aaae1523920ff18cd2e2ca91826d1168e59141bf Mon Sep 17 00:00:00 2001 From: vama Date: Thu, 2 Nov 2023 04:25:08 +0530 Subject: [PATCH 55/69] Updated grammer in single-server-example.md (#1265) --- docs/single-server-example.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/single-server-example.md b/docs/single-server-example.md index 4176f61e..419d8766 100644 --- a/docs/single-server-example.md +++ b/docs/single-server-example.md @@ -41,7 +41,7 @@ chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose ### Prepare -Clone `frappe_docker` repo for the needed YAMLs and change the current working director of you shell to the cloned repo. +Clone `frappe_docker` repo for the needed YAMLs and change the current working directory of your shell to the cloned repo. ```shell git clone https://github.com/frappe/frappe_docker From 9321153b793edda5b896d41d300812664533cf91 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 17:04:00 +0530 Subject: [PATCH 56/69] chore(deps): Update pre-commit hooks (#1268) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 201ee45a..2d46a1b6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: args: [--py37-plus] - repo: https://github.com/psf/black - rev: 23.10.1 + rev: 23.11.0 hooks: - id: black From 45200bd57f92dd70c4678782c706d0ff7abea733 Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Mon, 13 Nov 2023 22:40:15 +0100 Subject: [PATCH 57/69] feat: add optional mailpit configuration (#1269) --- devcontainer-example/docker-compose.yml | 16 ++++++++++++++++ docs/development.md | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index c73dd066..e27b8daa 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -20,6 +20,21 @@ services: # volumes: # - postgresql-data:/var/lib/postgresql/data + # Enable Mailpit if you need to test outgoing mail services + # See https://mailpit.axllent.org/ + # mailpit: + # image: axllent/mailpit + # volumes: + # - mailpit-data:/data + # ports: + # - 8025:8025 + # - 1025:1025 + # environment: + # MP_MAX_MESSAGES: 5000 + # MP_DATA_FILE: /data/mailpit.db + # MP_SMTP_AUTH_ACCEPT_ANY: 1 + # MP_SMTP_AUTH_ALLOW_INSECURE: 1 + redis-cache: image: docker.io/redis:alpine @@ -69,3 +84,4 @@ services: volumes: mariadb-data: #postgresql-data: + #mailpit-data: diff --git a/docs/development.md b/docs/development.md index 27d0eecc..54690a3e 100644 --- a/docs/development.md +++ b/docs/development.md @@ -408,3 +408,8 @@ This script will install required deps, enable X11Forwarding and restart SSH dae > More references : [Cypress Official Documentation](https://www.cypress.io/blog/2019/05/02/run-cypress-with-a-single-docker-command) > Ensure DISPLAY environment is always exported. + +## Using Mailpit to test mail services + +To use Mailpit just uncomment the service in the docker-compose.yml file. +The Interface is then available under port 8025 and the smtp service can be used as mailpit:1025. From 9da52f5009dd4dd050a008ebca00406dac5d2cec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 12:50:08 +0530 Subject: [PATCH 58/69] chore(deps): Update pre-commit hooks (#1270) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2d46a1b6..a7e6e048 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,7 +24,7 @@ repos: - id: isort - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 + rev: v3.1.0 hooks: - id: prettier From d92ba9f4415e1601ec9c0f0ec1da8e0719191b13 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 16 Nov 2023 06:59:51 +0000 Subject: [PATCH 59/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 607084f9..68520c51 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.0.0 +ERPNEXT_VERSION=v15.1.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e43d2c10..f4dab55e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.0.0 + image: frappe/erpnext:v15.1.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.0.0 + image: frappe/erpnext:v15.1.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.0.0 + image: frappe/erpnext:v15.1.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.0.0 + image: frappe/erpnext:v15.1.0 deploy: restart_policy: condition: on-failure @@ -111,7 +111,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.0.0 + image: frappe/erpnext:v15.1.0 deploy: restart_policy: condition: on-failure @@ -125,7 +125,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.0.0 + image: frappe/erpnext:v15.1.0 deploy: restart_policy: condition: on-failure @@ -155,7 +155,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.0.0 + image: frappe/erpnext:v15.1.0 deploy: restart_policy: condition: on-failure @@ -167,7 +167,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.0.0 + image: frappe/erpnext:v15.1.0 deploy: restart_policy: condition: on-failure From 28113baebf857aef3af8ecbd5ff38825516b6ce5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 17 Nov 2023 07:52:22 +0000 Subject: [PATCH 60/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 68520c51..966f3e27 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.1.0 +ERPNEXT_VERSION=v15.2.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f4dab55e..b6aee9ae 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.1.0 + image: frappe/erpnext:v15.2.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.1.0 + image: frappe/erpnext:v15.2.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.1.0 + image: frappe/erpnext:v15.2.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.1.0 + image: frappe/erpnext:v15.2.0 deploy: restart_policy: condition: on-failure @@ -111,7 +111,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.1.0 + image: frappe/erpnext:v15.2.0 deploy: restart_policy: condition: on-failure @@ -125,7 +125,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.1.0 + image: frappe/erpnext:v15.2.0 deploy: restart_policy: condition: on-failure @@ -155,7 +155,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.1.0 + image: frappe/erpnext:v15.2.0 deploy: restart_policy: condition: on-failure @@ -167,7 +167,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.1.0 + image: frappe/erpnext:v15.2.0 deploy: restart_policy: condition: on-failure From 947fbae8bb051ec85ec2a817b2fa3fe2d9eea779 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 14:16:04 +0530 Subject: [PATCH 61/69] chore(deps): bump docker/bake-action from 4.0.0 to 4.1.0 (#1272) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 4 ++-- .github/workflows/docker-build-push.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index bc065413..26003f28 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -38,7 +38,7 @@ jobs: run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV" - name: Build and test - uses: docker/bake-action@v4.0.0 + uses: docker/bake-action@v4.1.0 with: targets: bench-test @@ -51,7 +51,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v4.0.0 + uses: docker/bake-action@v4.1.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index a6cd5a79..3cd14943 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -56,7 +56,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v4.0.0 + uses: docker/bake-action@v4.1.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v4.0.0 + uses: docker/bake-action@v4.1.0 with: push: true From 22a4787dbc86fbe6791392147c7d8a7ffec0ef02 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 21 Nov 2023 19:05:58 +0000 Subject: [PATCH 62/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 966f3e27..76a622a6 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.2.0 +ERPNEXT_VERSION=v15.3.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index b6aee9ae..08af7994 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.2.0 + image: frappe/erpnext:v15.3.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.2.0 + image: frappe/erpnext:v15.3.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.2.0 + image: frappe/erpnext:v15.3.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.2.0 + image: frappe/erpnext:v15.3.0 deploy: restart_policy: condition: on-failure @@ -111,7 +111,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.2.0 + image: frappe/erpnext:v15.3.0 deploy: restart_policy: condition: on-failure @@ -125,7 +125,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.2.0 + image: frappe/erpnext:v15.3.0 deploy: restart_policy: condition: on-failure @@ -155,7 +155,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.2.0 + image: frappe/erpnext:v15.3.0 deploy: restart_policy: condition: on-failure @@ -167,7 +167,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.2.0 + image: frappe/erpnext:v15.3.0 deploy: restart_policy: condition: on-failure From 64cd39265bdda784580a8bf5005cabf62dd4828d Mon Sep 17 00:00:00 2001 From: Bhavansathru <122002510+Bhavan23@users.noreply.github.com> Date: Thu, 23 Nov 2023 14:14:04 +0530 Subject: [PATCH 63/69] Update development.md (#1274) --- docs/development.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/development.md b/docs/development.md index 54690a3e..d8813326 100644 --- a/docs/development.md +++ b/docs/development.md @@ -70,6 +70,8 @@ Notes: Run the following commands in the terminal inside the container. You might need to create a new terminal in VSCode. +NOTE: Prior to doing the following, make sure the user is **frappe**. + ```shell bench init --skip-redis-config-generation frappe-bench cd frappe-bench From 6ccb1102038802fa9d1bb765375ddffde8a8fa99 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 28 Nov 2023 16:33:29 +0000 Subject: [PATCH 64/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 76a622a6..fb4d5d63 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.3.0 +ERPNEXT_VERSION=v15.4.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 08af7994..6e93db84 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.3.0 + image: frappe/erpnext:v15.4.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.3.0 + image: frappe/erpnext:v15.4.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.3.0 + image: frappe/erpnext:v15.4.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.3.0 + image: frappe/erpnext:v15.4.0 deploy: restart_policy: condition: on-failure @@ -111,7 +111,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.3.0 + image: frappe/erpnext:v15.4.0 deploy: restart_policy: condition: on-failure @@ -125,7 +125,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.3.0 + image: frappe/erpnext:v15.4.0 deploy: restart_policy: condition: on-failure @@ -155,7 +155,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.3.0 + image: frappe/erpnext:v15.4.0 deploy: restart_policy: condition: on-failure @@ -167,7 +167,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.3.0 + image: frappe/erpnext:v15.4.0 deploy: restart_policy: condition: on-failure From 2aa5b30969271ce8bfaba74d00cb9c12ba3ba46d Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 5 Dec 2023 14:00:19 +0000 Subject: [PATCH 65/69] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index fb4d5d63..3a0f1226 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.4.0 +ERPNEXT_VERSION=v15.5.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6e93db84..45d5ae8b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.4.0 + image: frappe/erpnext:v15.5.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.4.0 + image: frappe/erpnext:v15.5.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.4.0 + image: frappe/erpnext:v15.5.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.4.0 + image: frappe/erpnext:v15.5.0 deploy: restart_policy: condition: on-failure @@ -111,7 +111,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.4.0 + image: frappe/erpnext:v15.5.0 deploy: restart_policy: condition: on-failure @@ -125,7 +125,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.4.0 + image: frappe/erpnext:v15.5.0 deploy: restart_policy: condition: on-failure @@ -155,7 +155,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.4.0 + image: frappe/erpnext:v15.5.0 deploy: restart_policy: condition: on-failure @@ -167,7 +167,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.4.0 + image: frappe/erpnext:v15.5.0 deploy: restart_policy: condition: on-failure From 4aa07b3672f7fdce458b51efee7463477262965e Mon Sep 17 00:00:00 2001 From: Piyush Date: Wed, 6 Dec 2023 20:50:39 -0800 Subject: [PATCH 66/69] Update troubleshoot.md (#1283) Added instructions for removal if want to start afresh --- docs/troubleshoot.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/troubleshoot.md b/docs/troubleshoot.md index a43ed13c..03f3e8e1 100644 --- a/docs/troubleshoot.md +++ b/docs/troubleshoot.md @@ -45,3 +45,11 @@ If you are using old version of `docker-compose` the .env file needs to be locat - Set environment variable `COMPOSE_CONVERT_WINDOWS_PATHS` e.g. `set COMPOSE_CONVERT_WINDOWS_PATHS=1` - While using docker machine, port-forward the ports of VM to ports of host machine. (ports 8080/8000/9000) - Name all the sites ending with `.localhost`. and access it via browser locally. e.g. `http://site1.localhost` + +### Redo installation + +- If you have made changes and just want to start over again (abandoning all changes), remove all docker + - containers + - images + - volumes +- Install afresh From 04128c60ebabfbcd5f5eeb19a66003fc90205a9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:14:43 +0530 Subject: [PATCH 67/69] chore(deps): bump actions/setup-go from 4 to 5 (#1286) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2eefea99..569034e9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,7 +22,7 @@ jobs: # For shfmt pre-commit hook - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: "^1.14" From 4717c3ee73d07e48f6ed31409f0f95c7dc9b811e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:15:08 +0530 Subject: [PATCH 68/69] chore(deps): bump actions/setup-python from 4 to 5 (#1287) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_stable.yml | 2 +- .github/workflows/docker-build-push.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index a09f70b8..3566b2ba 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -65,7 +65,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 3cd14943..b519ec9a 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -63,7 +63,7 @@ jobs: REGISTRY_USER: localhost:5000/frappe - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 569034e9..ce4ab6ee 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10.6" From 89860467d43c9b43b210e98059b155c9337466a1 Mon Sep 17 00:00:00 2001 From: MohsinAli Date: Thu, 7 Dec 2023 14:19:32 +0530 Subject: [PATCH 69/69] fix: space (#1285) --- docs/troubleshoot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/troubleshoot.md b/docs/troubleshoot.md index 03f3e8e1..68718280 100644 --- a/docs/troubleshoot.md +++ b/docs/troubleshoot.md @@ -52,4 +52,4 @@ If you are using old version of `docker-compose` the .env file needs to be locat - containers - images - volumes -- Install afresh +- Install a fresh