From ff532e14d2a71a21b20c240c999d223e15d6794f Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Feb 2024 12:21:56 +0000 Subject: [PATCH 001/193] 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 0566760f..c5949835 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.13.0 +ERPNEXT_VERSION=v15.14.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a2c1c858..9833f34c 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure From 7fee2dc8f369aaaf78a0258227649b55a17fc5d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 10:50:49 +0530 Subject: [PATCH 002/193] chore(deps): Update pre-commit hooks (#1334) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 41d81fdb..72ee627c 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: 24.1.1 + rev: 24.2.0 hooks: - id: black From 53c6a0e0c6778c018e7d76081750d75a4a923a4e Mon Sep 17 00:00:00 2001 From: Kevin Wakhisi Maraka Date: Fri, 16 Feb 2024 09:53:01 +0300 Subject: [PATCH 003/193] chore! :alien: Enhance dev container YAML (#1332) * chore!i :alien: Enhance dev container YAML Enhance dev container YAML to meet standards and integrate personal GitHub environment token Refactored the existing dev container YAML configuration to adhere to best practices and coding standards. This includes optimizing container setup and dependencies for smoother development workflows. Additionally, integrated a personal GitHub environment token for secure authentication and access to GitHub resources within the container environment. This improvement enhances both security and usability, streamlining the development process. * chore :lipstick: Fixed earlier commit Earlier commit fixed using pre-commit --- devcontainer-example/devcontainer.json | 38 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/devcontainer-example/devcontainer.json b/devcontainer-example/devcontainer.json index d80b845d..dd918069 100644 --- a/devcontainer-example/devcontainer.json +++ b/devcontainer-example/devcontainer.json @@ -2,24 +2,32 @@ "name": "Frappe Bench", "forwardPorts": [8000, 9000, 6787], "remoteUser": "frappe", - "settings": { - "terminal.integrated.profiles.linux": { - "frappe bash": { - "path": "/bin/bash", - }, - }, - "terminal.integrated.defaultProfile.linux": "frappe bash", - "debug.node.autoAttach": "disabled", + "customizations": { + "vscode": { + "extensions": [ + "ms-python.python", + "ms-vscode.live-server", + "grapecity.gc-excelviewer", + "mtxr.sqltools", + "visualstudioexptteam.vscodeintellicode" + ], + "settings": { + "terminal.integrated.profiles.linux": { + "frappe bash": { + "path": "/bin/bash" + } + }, + "terminal.integrated.defaultProfile.linux": "frappe bash", + "debug.node.autoAttach": "disabled" + } + } }, "dockerComposeFile": "./docker-compose.yml", "service": "frappe", "workspaceFolder": "/workspace/development", "shutdownAction": "stopCompose", - "extensions": [ - "ms-python.python", - "ms-vscode.live-server", - "grapecity.gc-excelviewer", - "mtxr.sqltools", - "visualstudioexptteam.vscodeintellicode", - ], + "postStartCommand": "sudo service ssh start", + "mounts": [ + "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/frappe/.ssh,type=bind,consistency=cached" + ] } From 8961598d1ea7259036e6892cfa3e9a6acff40c71 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Feb 2024 10:38:23 +0000 Subject: [PATCH 004/193] 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 c5949835..2e68f6c8 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.14.0 +ERPNEXT_VERSION=v15.14.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 9833f34c..13af36c8 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure From d027f04494588d9f3e3e9a96549bea69cad2b5c2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Feb 2024 16:29:20 +0000 Subject: [PATCH 005/193] 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 2e68f6c8..12b34f57 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.14.1 +ERPNEXT_VERSION=v15.14.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 13af36c8..0aad32e2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure From f60dc886375858499da664a639d1b75378c65112 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 19 Feb 2024 05:42:49 +0000 Subject: [PATCH 006/193] 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 12b34f57..a16cbf64 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.14.2 +ERPNEXT_VERSION=v15.14.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0aad32e2..6044b784 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure From edb9948fc932ec10ad06c42bb846e7c01e581476 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 18:31:06 +0530 Subject: [PATCH 007/193] chore(deps): Update pre-commit hooks (#1338) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 72ee627c..3fcd5dc9 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.15.0 + rev: v3.15.1 hooks: - id: pyupgrade args: [--py37-plus] From 2c317cb62da88d2fbd2c91f24de8f11083a7a94a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 18:31:25 +0530 Subject: [PATCH 008/193] chore(deps): bump pytest from 8.0.0 to 8.0.1 (#1339) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.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/8.0.0...8.0.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 8075a1ec..61195c7d 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.0.0 +pytest==8.0.1 From 3360d23e55a9cb7aa6c0d402cbf4e30b334e68cd Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 21 Feb 2024 05:38:43 +0000 Subject: [PATCH 009/193] 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 a16cbf64..d5405f20 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.14.3 +ERPNEXT_VERSION=v15.14.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6044b784..a2449b13 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure From d028de489891b68bde7044f8915809f7fb9f7a4e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Feb 2024 05:47:42 +0000 Subject: [PATCH 010/193] 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 d5405f20..c3b7fda9 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.14.4 +ERPNEXT_VERSION=v15.14.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a2449b13..23cbde99 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure From 3bc28d38b288cd49b3e002590af4da9007025ab7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Feb 2024 11:27:44 +0000 Subject: [PATCH 011/193] 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 c3b7fda9..a5584142 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.14.5 +ERPNEXT_VERSION=v15.14.6 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 23cbde99..630f107b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure From 4c0aba6b0c8f6aad6d9b176547da7de3a55d50bb Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 26 Feb 2024 07:42:07 +0000 Subject: [PATCH 012/193] 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 a5584142..940728f6 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.14.6 +ERPNEXT_VERSION=v15.14.7 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 630f107b..22f0bfcf 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure From ab0d6ad9e5833f249599e6aafeef6d38244e5362 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 02:41:20 +0530 Subject: [PATCH 013/193] chore(deps): bump pytest from 8.0.1 to 8.0.2 (#1341) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.1 to 8.0.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/8.0.1...8.0.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 61195c7d..a9882e0c 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.0.1 +pytest==8.0.2 From 33cbdb2693e8021fd8fd369b92aee013a92166ae Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Feb 2024 05:22:17 +0000 Subject: [PATCH 014/193] 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 940728f6..359f5703 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.14.7 +ERPNEXT_VERSION=v15.15.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 22f0bfcf..6490fa53 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure From e582a2448d7c69f410231e55f9e5ef2b9585ae95 Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Thu, 29 Feb 2024 13:15:56 +0100 Subject: [PATCH 015/193] fix: add file cmd because restore bench need it since frappe commit: 50d21677b872ff89d2912c7b57467757a35f549a (#1343) --- images/bench/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 291e4256..ec7078e2 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -69,6 +69,7 @@ RUN apt-get update \ xz-utils \ tk-dev \ liblzma-dev \ + file \ && rm -rf /var/lib/apt/lists/* RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ From 955a3b0b6543c9d7ac2b4731834f576870262194 Mon Sep 17 00:00:00 2001 From: John Haugabook Date: Thu, 29 Feb 2024 07:16:18 -0500 Subject: [PATCH 016/193] fix: grammar and links (#1342) Made grammar corrections, and added links to the prerequisite installations. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 436e3f4a..43816c84 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Everything about [Frappe](https://github.com/frappe/frappe) and [ERPNext](https: # Getting Started -To get started, you need Docker, docker-compose and git setup on your machine. For Docker basics and best practices. Refer Docker [documentation](http://docs.docker.com). +To get started you need [Docker](https://docs.docker.com/get-docker/), [docker-compose](https://docs.docker.com/compose/), and [git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git) setup on your machine. For Docker basics and best practices refer to Docker's [documentation](http://docs.docker.com). After that, clone this repo: ```sh From ede911af0aa5b720ba6a5b673f5a51efb0f3a90b Mon Sep 17 00:00:00 2001 From: Malay Gondalia <134581231+malay-gondalia@users.noreply.github.com> Date: Thu, 29 Feb 2024 20:59:32 +0530 Subject: [PATCH 017/193] Update custom-apps.md (#1344) * Update custom-apps.md made document clear to insert custom app to build and resolved error - "url": "https://user:password@git.example.com/project/repository.git", to "url": "https://{{ PAT }}@git.example.com/project/repository.git", * docs: remove comments from shell commands --------- Co-authored-by: Revant Nandgaonkar --- docs/custom-apps.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/custom-apps.md b/docs/custom-apps.md index c2cb6f85..9d31c6bb 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -20,10 +20,11 @@ export APPS_JSON='[ "branch": "version-15" }, { - "url": "https://user:password@git.example.com/project/repository.git", + "url": "https://{{ PAT }}@git.example.com/project/repository.git", "branch": "main" } ]' + export APPS_JSON_BASE64=$(echo ${APPS_JSON} | base64 -w 0) ``` @@ -35,7 +36,7 @@ export APPS_JSON_BASE64=$(base64 -w 0 /path/to/apps.json) Note: -- `url` needs to be http(s) git url with token/auth in case of private repo. +- `url` needs to be http(s) git url with personal access tokens without username eg:- http://{{PAT}}@github.com/project/repository.git in case of private repo. - add dependencies manually in `apps.json` e.g. add `payments` if you are installing `erpnext` - use fork repo or branch for ERPNext in case you need to use your fork or test a PR. From 997473863ee7b17e86acb175099708cf886aedd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:11:59 +0530 Subject: [PATCH 018/193] chore(deps): bump pytest from 8.0.2 to 8.1.0 (#1347) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.2 to 8.1.0. - [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/8.0.2...8.1.0) --- updated-dependencies: - dependency-name: pytest 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> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index a9882e0c..81cf8a95 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.0.2 +pytest==8.1.0 From 1eafdcdc8555bb84083ed7176bf4c0f70892d29a Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Mar 2024 03:40:05 +0000 Subject: [PATCH 019/193] 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 359f5703..96a5f9a5 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.15.0 +ERPNEXT_VERSION=v15.16.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6490fa53..f9693c9b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure From 82c65ec147902df4d430509ad98a44ef8e2be329 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Mar 2024 14:57:10 +0000 Subject: [PATCH 020/193] 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 96a5f9a5..31929465 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.16.0 +ERPNEXT_VERSION=v15.16.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f9693c9b..065d6d68 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure From 76976c30e1983cf97a0250e147323a37add95810 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 7 Mar 2024 09:33:50 +0000 Subject: [PATCH 021/193] 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 31929465..99b41c04 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.16.1 +ERPNEXT_VERSION=v15.16.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 065d6d68..13bace25 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure From 636c442fdbcec7e0c064da392579f8f81033fe64 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 10 Mar 2024 05:38:16 +0530 Subject: [PATCH 022/193] fix(dev): remove ssh from post start command (#1349) no ssh service installed in frappe/bench:latest for custom usage add to gitignored .devcontainer --- devcontainer-example/devcontainer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/devcontainer-example/devcontainer.json b/devcontainer-example/devcontainer.json index dd918069..2e60f65d 100644 --- a/devcontainer-example/devcontainer.json +++ b/devcontainer-example/devcontainer.json @@ -26,7 +26,6 @@ "service": "frappe", "workspaceFolder": "/workspace/development", "shutdownAction": "stopCompose", - "postStartCommand": "sudo service ssh start", "mounts": [ "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/frappe/.ssh,type=bind,consistency=cached" ] From a33ec8460fc07e8c4b4c0284fe88b870e18be4c6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 13 Mar 2024 04:37:40 +0000 Subject: [PATCH 023/193] 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 99b41c04..a983f406 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.16.2 +ERPNEXT_VERSION=v15.17.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 13bace25..0a1bb498 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure From f7c497e240d4ecd0fa448585d5f3a0ae810c5977 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Mar 2024 09:25:53 +0000 Subject: [PATCH 024/193] 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 a983f406..1495dec7 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.17.0 +ERPNEXT_VERSION=v15.17.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0a1bb498..2b330ece 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure From a8d7a70b269e2d8b1795c5d13cdd61439fffa045 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 11:08:57 +0530 Subject: [PATCH 025/193] chore(deps): bump pytest from 8.1.0 to 8.1.1 (#1350) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.0 to 8.1.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/8.1.0...8.1.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 81cf8a95..2f6c9d20 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.1.0 +pytest==8.1.1 From cf35c277ab87430aa3eae0f6cc247cc96d2dac33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 11:09:12 +0530 Subject: [PATCH 026/193] chore(deps): bump docker/bake-action from 4.1.0 to 4.3.0 (#1354) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 4.1.0 to 4.3.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v4.1.0...v4.3.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 26003f28..2d8c1e16 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.1.0 + uses: docker/bake-action@v4.3.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.1.0 + uses: docker/bake-action@v4.3.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index b519ec9a..46a0b012 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.1.0 + uses: docker/bake-action@v4.3.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v4.1.0 + uses: docker/bake-action@v4.3.0 with: push: true From a7d3ec1816aab92ce07273841af4ee30a94c5e65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 11:09:34 +0530 Subject: [PATCH 027/193] chore(deps): Update pre-commit hooks (#1355) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 3fcd5dc9..ecde0607 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: 24.2.0 + rev: 24.3.0 hooks: - id: black From feb16790992fcabf53bb55288e030c79fa2246ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:54:17 +0530 Subject: [PATCH 028/193] chore(deps): Update pre-commit hooks (#1356) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 ecde0607..c6a37f02 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.6 + rev: v0.10.0.1 hooks: - id: shellcheck args: [-x] From 10151543852d1ad08de00ba5bfbaf80fbde89bfb Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Mar 2024 05:32:07 +0000 Subject: [PATCH 029/193] 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 1495dec7..85ec43a5 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.17.1 +ERPNEXT_VERSION=v15.17.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2b330ece..a57363e9 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.17.1 + image: frappe/erpnext:v15.17.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.17.1 + image: frappe/erpnext:v15.17.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.17.1 + image: frappe/erpnext:v15.17.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.17.1 + image: frappe/erpnext:v15.17.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.17.1 + image: frappe/erpnext:v15.17.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.17.1 + image: frappe/erpnext:v15.17.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.17.1 + image: frappe/erpnext:v15.17.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.17.1 + image: frappe/erpnext:v15.17.2 deploy: restart_policy: condition: on-failure From a110ce9fb37c014008feef97ec0acda53e98c9c1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Mar 2024 15:09:56 +0000 Subject: [PATCH 030/193] 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 85ec43a5..3d84dad7 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.17.2 +ERPNEXT_VERSION=v15.17.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a57363e9..8189f7b3 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.17.2 + image: frappe/erpnext:v15.17.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.17.2 + image: frappe/erpnext:v15.17.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.17.2 + image: frappe/erpnext:v15.17.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.17.2 + image: frappe/erpnext:v15.17.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.17.2 + image: frappe/erpnext:v15.17.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.17.2 + image: frappe/erpnext:v15.17.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.17.2 + image: frappe/erpnext:v15.17.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.17.2 + image: frappe/erpnext:v15.17.3 deploy: restart_policy: condition: on-failure From 530615fee3a043495cbba6a9d93aa24eaf898124 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 21 Mar 2024 17:39:04 +0000 Subject: [PATCH 031/193] 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 3d84dad7..7fe0bc87 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.17.3 +ERPNEXT_VERSION=v15.17.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8189f7b3..af1c27cd 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.17.3 + image: frappe/erpnext:v15.17.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.17.3 + image: frappe/erpnext:v15.17.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.17.3 + image: frappe/erpnext:v15.17.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.17.3 + image: frappe/erpnext:v15.17.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.17.3 + image: frappe/erpnext:v15.17.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.17.3 + image: frappe/erpnext:v15.17.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.17.3 + image: frappe/erpnext:v15.17.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.17.3 + image: frappe/erpnext:v15.17.4 deploy: restart_policy: condition: on-failure From 76a3d5df804ad0cdf5db417a30e2a9918564c37e Mon Sep 17 00:00:00 2001 From: Dhafer Soudani Date: Fri, 22 Mar 2024 06:57:00 +0100 Subject: [PATCH 032/193] fix: add missing file package for bench restore (#1359) Co-authored-by: dhafer --- images/custom/Containerfile | 1 + images/production/Containerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/images/custom/Containerfile b/images/custom/Containerfile index a7c0fd38..eed82e54 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -19,6 +19,7 @@ RUN useradd -ms /bin/bash frappe \ vim \ nginx \ gettext-base \ + file \ # weasyprint dependencies libpango-1.0-0 \ libharfbuzz0b \ diff --git a/images/production/Containerfile b/images/production/Containerfile index 65e412f8..c4eeff8b 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -16,6 +16,7 @@ RUN useradd -ms /bin/bash frappe \ vim \ nginx \ gettext-base \ + file \ # weasyprint dependencies libpango-1.0-0 \ libharfbuzz0b \ From 04092e153c6802355f7afdaf53c5ab45d722e84c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 22 Mar 2024 10:39:23 +0000 Subject: [PATCH 033/193] 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 7fe0bc87..ff380af7 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.17.4 +ERPNEXT_VERSION=v15.17.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index af1c27cd..e298d066 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.17.4 + image: frappe/erpnext:v15.17.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.17.4 + image: frappe/erpnext:v15.17.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.17.4 + image: frappe/erpnext:v15.17.5 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.17.4 + image: frappe/erpnext:v15.17.5 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.17.4 + image: frappe/erpnext:v15.17.5 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.17.4 + image: frappe/erpnext:v15.17.5 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.17.4 + image: frappe/erpnext:v15.17.5 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.17.4 + image: frappe/erpnext:v15.17.5 deploy: restart_policy: condition: on-failure From 6f33a8aeba0833dd3cb34714384689166b269118 Mon Sep 17 00:00:00 2001 From: Bernhard Sirlinger Date: Sat, 23 Mar 2024 09:59:20 +0100 Subject: [PATCH 034/193] feat: add defaultInterpreterPath as a vscode setting as a starting point according to docs (#1358) See: https://github.com/microsoft/vscode-python/wiki/Setting-descriptions#pythondefaultinterpreterpath --- development/vscode-example/settings.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 development/vscode-example/settings.json diff --git a/development/vscode-example/settings.json b/development/vscode-example/settings.json new file mode 100644 index 00000000..1490b727 --- /dev/null +++ b/development/vscode-example/settings.json @@ -0,0 +1,3 @@ +{ + "python.defaultInterpreterPath": "${workspaceFolder}/frappe-bench/env/bin/python" +} From 37c76255689d4f9541dd7c8a2431b7f6fa83c2e0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 25 Mar 2024 03:03:44 +0000 Subject: [PATCH 035/193] 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 ff380af7..835f144e 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.17.5 +ERPNEXT_VERSION=v15.17.6 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e298d066..8092f8d4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.17.5 + image: frappe/erpnext:v15.17.6 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.17.5 + image: frappe/erpnext:v15.17.6 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.17.5 + image: frappe/erpnext:v15.17.6 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.17.5 + image: frappe/erpnext:v15.17.6 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.17.5 + image: frappe/erpnext:v15.17.6 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.17.5 + image: frappe/erpnext:v15.17.6 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.17.5 + image: frappe/erpnext:v15.17.6 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.17.5 + image: frappe/erpnext:v15.17.6 deploy: restart_policy: condition: on-failure From ef3e81253bd131e78743a0ce4a5ef79408458b33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:18:37 +0530 Subject: [PATCH 036/193] chore(deps): Update pre-commit hooks (#1363) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 c6a37f02..24bd92cb 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.15.1 + rev: v3.15.2 hooks: - id: pyupgrade args: [--py37-plus] From ff7e608d097c7eef67e1707daf6aa1fe68786004 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Mar 2024 03:36:07 +0000 Subject: [PATCH 037/193] 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 835f144e..206f23ec 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.17.6 +ERPNEXT_VERSION=v15.18.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8092f8d4..c8087e84 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.17.6 + image: frappe/erpnext:v15.18.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.17.6 + image: frappe/erpnext:v15.18.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.17.6 + image: frappe/erpnext:v15.18.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.17.6 + image: frappe/erpnext:v15.18.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.17.6 + image: frappe/erpnext:v15.18.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.17.6 + image: frappe/erpnext:v15.18.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.17.6 + image: frappe/erpnext:v15.18.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.17.6 + image: frappe/erpnext:v15.18.0 deploy: restart_policy: condition: on-failure From b0373fd6a3a3b334663cba3f8b1fe565a4f342a6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Mar 2024 08:46:04 +0000 Subject: [PATCH 038/193] 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 206f23ec..2ef8be87 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.18.0 +ERPNEXT_VERSION=v15.18.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c8087e84..935095e8 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.18.0 + image: frappe/erpnext:v15.18.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.18.0 + image: frappe/erpnext:v15.18.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.18.0 + image: frappe/erpnext:v15.18.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.18.0 + image: frappe/erpnext:v15.18.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.18.0 + image: frappe/erpnext:v15.18.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.18.0 + image: frappe/erpnext:v15.18.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.18.0 + image: frappe/erpnext:v15.18.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.18.0 + image: frappe/erpnext:v15.18.1 deploy: restart_policy: condition: on-failure From 177f5ab96feb8001819eb42cbf0752d6f87a8e80 Mon Sep 17 00:00:00 2001 From: Arken June Malvecino <83942196+arkenm@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:55:34 +0800 Subject: [PATCH 039/193] Install Latest Version to Mac/Linux Doc Update (#1360) * refactor: update from pwd.yml * refactor: update erpnext image to v15 --- docs/setup_for_linux_mac.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index 651f67ca..8e1fb906 100644 --- a/docs/setup_for_linux_mac.md +++ b/docs/setup_for_linux_mac.md @@ -15,7 +15,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -25,7 +25,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -33,6 +33,7 @@ services: entrypoint: - bash - -c + # add redis_socketio for backward compatibility command: - > ls -1 apps > sites/apps.txt; @@ -40,6 +41,7 @@ services: bench set-config -gp db_port $$DB_PORT; bench set-config -g redis_cache "redis://$$REDIS_CACHE"; bench set-config -g redis_queue "redis://$$REDIS_QUEUE"; + bench set-config -g redis_socketio "redis://$$REDIS_QUEUE"; bench set-config -gp socketio_port $$SOCKETIO_PORT; environment: DB_HOST: db @@ -52,7 +54,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -104,8 +106,10 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 + depends_on: + - websocket deploy: restart_policy: condition: on-failure @@ -127,7 +131,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -136,13 +140,13 @@ services: - bench - worker - --queue - - long + - long,default,short volumes: - sites:/home/frappe/frappe-bench/sites - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -151,7 +155,7 @@ services: - bench - worker - --queue - - short + - short,default volumes: - sites:/home/frappe/frappe-bench/sites - logs:/home/frappe/frappe-bench/logs @@ -175,7 +179,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: @@ -188,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14 + image: frappe/erpnext:v15 platform: linux/amd64 deploy: restart_policy: From b48c1bcd1a628bba9eb7d317f209f0f2d8234a1b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 29 Mar 2024 05:50:30 +0000 Subject: [PATCH 040/193] 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 2ef8be87..5404c138 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.18.1 +ERPNEXT_VERSION=v15.18.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 935095e8..3f598711 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.18.1 + image: frappe/erpnext:v15.18.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.18.1 + image: frappe/erpnext:v15.18.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.18.1 + image: frappe/erpnext:v15.18.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.18.1 + image: frappe/erpnext:v15.18.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.18.1 + image: frappe/erpnext:v15.18.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.18.1 + image: frappe/erpnext:v15.18.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.18.1 + image: frappe/erpnext:v15.18.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.18.1 + image: frappe/erpnext:v15.18.2 deploy: restart_policy: condition: on-failure From 09c69baaec47b7222b40f19c6b62de98d68651e0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 29 Mar 2024 19:18:38 +0000 Subject: [PATCH 041/193] 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 5404c138..b16a73b2 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.18.2 +ERPNEXT_VERSION=v15.18.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3f598711..99b80f50 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.18.2 + image: frappe/erpnext:v15.18.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.18.2 + image: frappe/erpnext:v15.18.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.18.2 + image: frappe/erpnext:v15.18.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.18.2 + image: frappe/erpnext:v15.18.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.18.2 + image: frappe/erpnext:v15.18.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.18.2 + image: frappe/erpnext:v15.18.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.18.2 + image: frappe/erpnext:v15.18.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.18.2 + image: frappe/erpnext:v15.18.3 deploy: restart_policy: condition: on-failure From afd991bcba3c92a51691e351ed5c306eeab33f9c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 3 Apr 2024 10:41:22 +0000 Subject: [PATCH 042/193] 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 b16a73b2..0a7219db 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.18.3 +ERPNEXT_VERSION=v15.19.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 99b80f50..f9f49c39 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.18.3 + image: frappe/erpnext:v15.19.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.18.3 + image: frappe/erpnext:v15.19.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.18.3 + image: frappe/erpnext:v15.19.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.18.3 + image: frappe/erpnext:v15.19.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.18.3 + image: frappe/erpnext:v15.19.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.18.3 + image: frappe/erpnext:v15.19.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.18.3 + image: frappe/erpnext:v15.19.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.18.3 + image: frappe/erpnext:v15.19.0 deploy: restart_policy: condition: on-failure From 901b9404b09909451bedce6bfb796a25813389d0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 Apr 2024 09:06:50 +0000 Subject: [PATCH 043/193] 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 0a7219db..e2447b2e 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.19.0 +ERPNEXT_VERSION=v15.19.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f9f49c39..203bfdb9 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.19.0 + image: frappe/erpnext:v15.19.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.19.0 + image: frappe/erpnext:v15.19.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.19.0 + image: frappe/erpnext:v15.19.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.19.0 + image: frappe/erpnext:v15.19.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.19.0 + image: frappe/erpnext:v15.19.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.19.0 + image: frappe/erpnext:v15.19.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.19.0 + image: frappe/erpnext:v15.19.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.19.0 + image: frappe/erpnext:v15.19.1 deploy: restart_policy: condition: on-failure From 92f60cc16d43336bbd02557519bbf7b1c43987c4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 7 Apr 2024 10:49:06 +0000 Subject: [PATCH 044/193] 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 e2447b2e..1912e810 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.19.1 +ERPNEXT_VERSION=v15.19.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 203bfdb9..7410b889 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.19.1 + image: frappe/erpnext:v15.19.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.19.1 + image: frappe/erpnext:v15.19.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.19.1 + image: frappe/erpnext:v15.19.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.19.1 + image: frappe/erpnext:v15.19.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.19.1 + image: frappe/erpnext:v15.19.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.19.1 + image: frappe/erpnext:v15.19.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.19.1 + image: frappe/erpnext:v15.19.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.19.1 + image: frappe/erpnext:v15.19.2 deploy: restart_policy: condition: on-failure From 1479201fd486d23e99e0eac8119c5cd0b6b0b0b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 03:14:53 +0530 Subject: [PATCH 045/193] chore(deps): Update pre-commit hooks (#1368) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 24bd92cb..bbdd67df 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.5.0 + rev: v4.6.0 hooks: - id: check-executables-have-shebangs - id: check-shebang-scripts-are-executable From e94081df87c257527ed88ce605cbab9bcb17ef39 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 11 Apr 2024 07:47:26 +0000 Subject: [PATCH 046/193] 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 1912e810..31df4417 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.19.2 +ERPNEXT_VERSION=v15.20.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7410b889..1962c1d1 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.19.2 + image: frappe/erpnext:v15.20.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.19.2 + image: frappe/erpnext:v15.20.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.19.2 + image: frappe/erpnext:v15.20.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.19.2 + image: frappe/erpnext:v15.20.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.19.2 + image: frappe/erpnext:v15.20.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.19.2 + image: frappe/erpnext:v15.20.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.19.2 + image: frappe/erpnext:v15.20.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.19.2 + image: frappe/erpnext:v15.20.0 deploy: restart_policy: condition: on-failure From ade69369fb92fe5ad44458c86b2f20f37ac65d08 Mon Sep 17 00:00:00 2001 From: Richard Pablo Date: Thu, 11 Apr 2024 13:44:32 +0100 Subject: [PATCH 047/193] #1370 Adding platform parameter (#1371) Adding the platform parameter to be able to run this compose in non amd64 platforms --- compose.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compose.yaml b/compose.yaml index f4d81b63..be9fe7ea 100644 --- a/compose.yaml +++ b/compose.yaml @@ -17,6 +17,7 @@ x-backend-defaults: &backend_defaults services: configurator: <<: *backend_defaults + platform: linux/amd64 entrypoint: - bash - -c @@ -40,9 +41,11 @@ services: backend: <<: *backend_defaults + platform: linux/amd64 frontend: <<: *customizable_image + platform: linux/amd64 command: - nginx-entrypoint.sh environment: @@ -62,6 +65,7 @@ services: websocket: <<: [*depends_on_configurator, *customizable_image] + platform: linux/amd64 command: - node - /home/frappe/frappe-bench/apps/frappe/socketio.js @@ -70,14 +74,17 @@ services: queue-short: <<: *backend_defaults + platform: linux/amd64 command: bench worker --queue short,default queue-long: <<: *backend_defaults + platform: linux/amd64 command: bench worker --queue long,default,short scheduler: <<: *backend_defaults + platform: linux/amd64 command: bench schedule # ERPNext requires local assets access (Frappe does not) From e2a1b4fd0f27b2e2fc284bd07e5a0cdafc2a290e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 11 Apr 2024 13:32:35 +0000 Subject: [PATCH 048/193] 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 31df4417..932c59e9 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.20.0 +ERPNEXT_VERSION=v15.20.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1962c1d1..35417894 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.20.0 + image: frappe/erpnext:v15.20.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.20.0 + image: frappe/erpnext:v15.20.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.20.0 + image: frappe/erpnext:v15.20.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.20.0 + image: frappe/erpnext:v15.20.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.20.0 + image: frappe/erpnext:v15.20.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.20.0 + image: frappe/erpnext:v15.20.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.20.0 + image: frappe/erpnext:v15.20.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.20.0 + image: frappe/erpnext:v15.20.1 deploy: restart_policy: condition: on-failure From 1bc075401f8203e7c16cc793edd9babd374eb8e1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 12 Apr 2024 10:10:30 +0000 Subject: [PATCH 049/193] 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 932c59e9..54366b82 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.20.1 +ERPNEXT_VERSION=v15.20.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 35417894..8dd112c5 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.20.1 + image: frappe/erpnext:v15.20.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.20.1 + image: frappe/erpnext:v15.20.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.20.1 + image: frappe/erpnext:v15.20.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.20.1 + image: frappe/erpnext:v15.20.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.20.1 + image: frappe/erpnext:v15.20.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.20.1 + image: frappe/erpnext:v15.20.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.20.1 + image: frappe/erpnext:v15.20.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.20.1 + image: frappe/erpnext:v15.20.2 deploy: restart_policy: condition: on-failure From 3ec36e2e571787af0649c1f0e32c04157864ee32 Mon Sep 17 00:00:00 2001 From: gp <370905+gparent@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:24:32 -0400 Subject: [PATCH 050/193] Improve custom apps documentation (#1374) --- docs/custom-apps.md | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/docs/custom-apps.md b/docs/custom-apps.md index 9d31c6bb..bc5194dd 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -43,11 +43,7 @@ Note: ### Build Image ```shell -buildah build \ - --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \ - --build-arg=FRAPPE_BRANCH=version-15 \ - --build-arg=PYTHON_VERSION=3.11.6 \ - --build-arg=NODE_VERSION=18.18.2 \ +docker build \ --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ --tag=ghcr.io/user/repo/custom:1.0.0 \ --file=images/custom/Containerfile . @@ -55,13 +51,24 @@ buildah build \ Note: -- Use `docker` instead of `buildah` as per your setup. -- `FRAPPE_PATH` and `FRAPPE_BRANCH` build args are optional and can be overridden in case of fork/branch or test a PR. +- Use `buildah` instead of `docker` as per your setup. - Make sure `APPS_JSON_BASE64` variable has correct base64 encoded JSON string. It is consumed as build arg, base64 encoding ensures it to be friendly with environment variables. Use `jq empty apps.json` to validate `apps.json` file. - Make sure the `--tag` is valid image name that will be pushed to registry. See section [below](#use-images) for remarks about its use. -- Change `--build-arg` as per version of Python, NodeJS, Frappe Framework repo and branch - `.git` directories for all apps are removed from the image. +Customize these optional `--build-arg`s to use a different Frappe Framework repo and branch, or version of Python and NodeJS: + +```shell +docker build \ + --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \ + --build-arg=FRAPPE_BRANCH=version-15 \ + --build-arg=PYTHON_VERSION=3.11.9 \ + --build-arg=NODE_VERSION=18.20.2 \ + --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ + --tag=ghcr.io/user/repo/custom:1.0.0 \ + --file=images/custom/Containerfile . +``` + ### Push image to use in yaml files Login to `docker` or `buildah` @@ -87,10 +94,6 @@ podman run --rm -it \ gcr.io/kaniko-project/executor:latest \ --dockerfile=images/custom/Containerfile \ --context=git://github.com/frappe/frappe_docker \ - --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \ - --build-arg=FRAPPE_BRANCH=version-14 \ - --build-arg=PYTHON_VERSION=3.10.12 \ - --build-arg=NODE_VERSION=16.20.1 \ --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ --cache=true \ --destination=ghcr.io/user/repo/custom:1.0.0 \ From 23c0c50993f15fd6c8291e7d77c1b9d03a0bcbdb Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 13 Apr 2024 10:37:29 +0000 Subject: [PATCH 051/193] 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 54366b82..d74508f0 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.20.2 +ERPNEXT_VERSION=v15.20.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8dd112c5..0948c143 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.20.2 + image: frappe/erpnext:v15.20.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.20.2 + image: frappe/erpnext:v15.20.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.20.2 + image: frappe/erpnext:v15.20.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.20.2 + image: frappe/erpnext:v15.20.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.20.2 + image: frappe/erpnext:v15.20.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.20.2 + image: frappe/erpnext:v15.20.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.20.2 + image: frappe/erpnext:v15.20.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.20.2 + image: frappe/erpnext:v15.20.3 deploy: restart_policy: condition: on-failure From 6af91304f10529eb33755cf4fc8ae093a2eb904f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 17:17:32 +0530 Subject: [PATCH 052/193] chore(deps): Update pre-commit hooks (#1375) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 bbdd67df..e171d66d 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: 24.3.0 + rev: 24.4.0 hooks: - id: black From 9f04d4c0ba235c5d2d36587ff246940dd0e4cd0a Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 17 Apr 2024 06:21:06 +0000 Subject: [PATCH 053/193] 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 d74508f0..f035b1ca 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.20.3 +ERPNEXT_VERSION=v15.20.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0948c143..b6b80b29 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.20.3 + image: frappe/erpnext:v15.20.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.20.3 + image: frappe/erpnext:v15.20.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.20.3 + image: frappe/erpnext:v15.20.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.20.3 + image: frappe/erpnext:v15.20.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.20.3 + image: frappe/erpnext:v15.20.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.20.3 + image: frappe/erpnext:v15.20.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.20.3 + image: frappe/erpnext:v15.20.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.20.3 + image: frappe/erpnext:v15.20.4 deploy: restart_policy: condition: on-failure From 9478eca866e6ef78f6bb743ef6a7214dcf191165 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 17 Apr 2024 09:34:14 +0000 Subject: [PATCH 054/193] 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 f035b1ca..5f26c184 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.20.4 +ERPNEXT_VERSION=v15.20.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index b6b80b29..cdbe2abb 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.20.4 + image: frappe/erpnext:v15.20.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.20.4 + image: frappe/erpnext:v15.20.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.20.4 + image: frappe/erpnext:v15.20.5 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.20.4 + image: frappe/erpnext:v15.20.5 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.20.4 + image: frappe/erpnext:v15.20.5 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.20.4 + image: frappe/erpnext:v15.20.5 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.20.4 + image: frappe/erpnext:v15.20.5 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.20.4 + image: frappe/erpnext:v15.20.5 deploy: restart_policy: condition: on-failure From 19f6fa52d489293db68fca3ea58bef674b11def1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 19 Apr 2024 08:48:43 +0000 Subject: [PATCH 055/193] 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 5f26c184..55580e29 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.20.5 +ERPNEXT_VERSION=v15.20.6 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index cdbe2abb..c7f061e2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.20.5 + image: frappe/erpnext:v15.20.6 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.20.5 + image: frappe/erpnext:v15.20.6 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.20.5 + image: frappe/erpnext:v15.20.6 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.20.5 + image: frappe/erpnext:v15.20.6 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.20.5 + image: frappe/erpnext:v15.20.6 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.20.5 + image: frappe/erpnext:v15.20.6 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.20.5 + image: frappe/erpnext:v15.20.6 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.20.5 + image: frappe/erpnext:v15.20.6 deploy: restart_policy: condition: on-failure From c4fa0766d2b0aa234c37ea1d7bb4d4a40e5e7ccc Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 Apr 2024 10:57:17 +0000 Subject: [PATCH 056/193] 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 55580e29..6bf4fdce 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.20.6 +ERPNEXT_VERSION=v15.21.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c7f061e2..b8f09557 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.20.6 + image: frappe/erpnext:v15.21.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.20.6 + image: frappe/erpnext:v15.21.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.20.6 + image: frappe/erpnext:v15.21.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.20.6 + image: frappe/erpnext:v15.21.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.20.6 + image: frappe/erpnext:v15.21.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.20.6 + image: frappe/erpnext:v15.21.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.20.6 + image: frappe/erpnext:v15.21.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.20.6 + image: frappe/erpnext:v15.21.0 deploy: restart_policy: condition: on-failure From 274ef8a9755d8944c0be5b79b3f8743d293a9a03 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 25 Apr 2024 03:47:23 +0000 Subject: [PATCH 057/193] 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 6bf4fdce..883bb1df 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.21.0 +ERPNEXT_VERSION=v15.21.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index b8f09557..bda8dd77 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.21.0 + image: frappe/erpnext:v15.21.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.21.0 + image: frappe/erpnext:v15.21.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.21.0 + image: frappe/erpnext:v15.21.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.21.0 + image: frappe/erpnext:v15.21.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.21.0 + image: frappe/erpnext:v15.21.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.21.0 + image: frappe/erpnext:v15.21.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.21.0 + image: frappe/erpnext:v15.21.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.21.0 + image: frappe/erpnext:v15.21.1 deploy: restart_policy: condition: on-failure From 9e091abc8dbf0adaace116f3e455059536cecbb8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:20:41 +0530 Subject: [PATCH 058/193] chore(deps): Update pre-commit hooks (#1382) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 e171d66d..eb3a7cc9 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: 24.4.0 + rev: 24.4.1 hooks: - id: black From 3b0ffc3bb91fab1788953580961bc492744e4dec Mon Sep 17 00:00:00 2001 From: Sudhegan Shyam <65366543+sudhegan@users.noreply.github.com> Date: Fri, 26 Apr 2024 04:46:07 +0530 Subject: [PATCH 059/193] add build library for arm64 binaries (#1379) * add build library for arm64 binaries * update git ignore * move arm64 lib to base layer --- .gitignore | 4 ++++ images/custom/Containerfile | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index 94a9fe2f..0a0b77ed 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,7 @@ venv # NodeJS node_modules + +#sudhegan frappe_docker git ignore +README.md +.github/workflows/ diff --git a/images/custom/Containerfile b/images/custom/Containerfile index eed82e54..e7d281fc 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -78,6 +78,12 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ # For frappe framework wget \ + #for building arm64 binaries + libcairo2-dev \ + libpango1.0-dev \ + libjpeg-dev \ + libgif-dev \ + librsvg2-dev \ # For psycopg2 libpq-dev \ # Other From 1c78d3eb6a0d4f8c5c929baf989d60cb0e190fa1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 26 Apr 2024 02:19:20 +0000 Subject: [PATCH 060/193] 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 883bb1df..98e899c7 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.21.1 +ERPNEXT_VERSION=v15.21.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index bda8dd77..2c777c4d 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.21.1 + image: frappe/erpnext:v15.21.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.21.1 + image: frappe/erpnext:v15.21.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.21.1 + image: frappe/erpnext:v15.21.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.21.1 + image: frappe/erpnext:v15.21.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.21.1 + image: frappe/erpnext:v15.21.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.21.1 + image: frappe/erpnext:v15.21.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.21.1 + image: frappe/erpnext:v15.21.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.21.1 + image: frappe/erpnext:v15.21.2 deploy: restart_policy: condition: on-failure From c5404245b36626101502a3659d59f392c5c835c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 12:24:38 +0530 Subject: [PATCH 061/193] chore(deps): Update pre-commit hooks (#1384) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 eb3a7cc9..72fbce64 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: 24.4.1 + rev: 24.4.2 hooks: - id: black From b7a652b9c64e6eaaa24dda9ef21c333eb8bd5a85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 12:25:05 +0530 Subject: [PATCH 062/193] chore(deps): bump pytest from 8.1.1 to 8.2.0 (#1389) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.1 to 8.2.0. - [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/8.1.1...8.2.0) --- updated-dependencies: - dependency-name: pytest 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> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 2f6c9d20..15d066af 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.1.1 +pytest==8.2.0 From 6fd6c7f0ae4aeeed2bc22b744d15197819ed7a39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 12:25:34 +0530 Subject: [PATCH 063/193] chore(deps): bump docker/bake-action from 4.3.0 to 4.5.0 (#1390) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 4.3.0 to 4.5.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v4.3.0...v4.5.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 2d8c1e16..e9d984dd 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.3.0 + uses: docker/bake-action@v4.5.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.3.0 + uses: docker/bake-action@v4.5.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 46a0b012..28f8c33e 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.3.0 + uses: docker/bake-action@v4.5.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v4.3.0 + uses: docker/bake-action@v4.5.0 with: push: true From 0942b8873ad365ac9764d63c0fd2a6dbc32f4f35 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 1 May 2024 12:25:49 +0530 Subject: [PATCH 064/193] fix: gitignore (#1391) --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0a0b77ed..94a9fe2f 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,3 @@ venv # NodeJS node_modules - -#sudhegan frappe_docker git ignore -README.md -.github/workflows/ From 4be1624641aabe51033a4743a0f6735ea2c4b2be Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 2 May 2024 04:32:28 +0000 Subject: [PATCH 065/193] 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 98e899c7..4d96557e 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.21.2 +ERPNEXT_VERSION=v15.22.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2c777c4d..9aaa8d38 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.21.2 + image: frappe/erpnext:v15.22.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.21.2 + image: frappe/erpnext:v15.22.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.21.2 + image: frappe/erpnext:v15.22.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.21.2 + image: frappe/erpnext:v15.22.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.21.2 + image: frappe/erpnext:v15.22.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.21.2 + image: frappe/erpnext:v15.22.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.21.2 + image: frappe/erpnext:v15.22.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.21.2 + image: frappe/erpnext:v15.22.0 deploy: restart_policy: condition: on-failure From 13904d0a72aef37ca2ef89439af1a2ac24cfd0e1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 3 May 2024 17:40:54 +0000 Subject: [PATCH 066/193] 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 4d96557e..80f8ba15 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.22.0 +ERPNEXT_VERSION=v15.22.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 9aaa8d38..b61c7a50 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.22.0 + image: frappe/erpnext:v15.22.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.22.0 + image: frappe/erpnext:v15.22.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.22.0 + image: frappe/erpnext:v15.22.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.22.0 + image: frappe/erpnext:v15.22.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.22.0 + image: frappe/erpnext:v15.22.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.22.0 + image: frappe/erpnext:v15.22.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.22.0 + image: frappe/erpnext:v15.22.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.22.0 + image: frappe/erpnext:v15.22.1 deploy: restart_policy: condition: on-failure From 1544788406bb06fe2296879c0878be3144715fdf Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 May 2024 08:50:11 +0000 Subject: [PATCH 067/193] 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 80f8ba15..6b04c5f7 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.22.1 +ERPNEXT_VERSION=v15.22.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index b61c7a50..4898a81f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.22.1 + image: frappe/erpnext:v15.22.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.22.1 + image: frappe/erpnext:v15.22.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.22.1 + image: frappe/erpnext:v15.22.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.22.1 + image: frappe/erpnext:v15.22.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.22.1 + image: frappe/erpnext:v15.22.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.22.1 + image: frappe/erpnext:v15.22.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.22.1 + image: frappe/erpnext:v15.22.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.22.1 + image: frappe/erpnext:v15.22.2 deploy: restart_policy: condition: on-failure From 8404d8946d04c070c771dad3e0f5603496e0d714 Mon Sep 17 00:00:00 2001 From: Bowrna Date: Tue, 7 May 2024 10:31:44 +0530 Subject: [PATCH 068/193] Update development.md (#1392) * Update development.md The extension name is renamed * Update development.md --- docs/development.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/development.md b/docs/development.md index d8813326..5f56d915 100644 --- a/docs/development.md +++ b/docs/development.md @@ -41,23 +41,23 @@ cp -R development/vscode-example development/.vscode ## Use VSCode Remote Containers extension -For most people getting started with Frappe development, the best solution is to use [VSCode Remote - Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers). +For most people getting started with Frappe development, the best solution is to use [VSCode Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers). Before opening the folder in container, determine the database that you want to use. The default is MariaDB. If you want to use PostgreSQL instead, edit `.devcontainer/docker-compose.yml` and uncomment the section for `postgresql` service, and you may also want to comment `mariadb` as well. VSCode should automatically inquire you to install the required extensions, that can also be installed manually as follows: -- Install Remote - Containers for VSCode +- Install Dev Containers for VSCode - through command line `code --install-extension ms-vscode-remote.remote-containers` - - clicking on the Install button in the Vistual Studio Marketplace: [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) + - clicking on the Install button in the Vistual Studio Marketplace: [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) - View: Extensions command in VSCode (Windows: Ctrl+Shift+X; macOS: Cmd+Shift+X) then search for extension `ms-vscode-remote.remote-containers` After the extensions are installed, you can: - Open frappe_docker folder in VS Code. - `code .` -- Launch the command, from Command Palette (Ctrl + Shift + P) `Remote-Containers: Reopen in Container`. You can also click in the bottom left corner to access the remote container menu. +- Launch the command, from Command Palette (Ctrl + Shift + P) `Dev Containers: Reopen in Container`. You can also click in the bottom left corner to access the remote container menu. Notes: From be41f8fe4fca1b04e5ef36cc0982cb28071003c9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 9 May 2024 05:38:37 +0000 Subject: [PATCH 069/193] 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 6b04c5f7..089064f5 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.22.2 +ERPNEXT_VERSION=v15.23.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 4898a81f..a89694b4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.22.2 + image: frappe/erpnext:v15.23.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.22.2 + image: frappe/erpnext:v15.23.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.22.2 + image: frappe/erpnext:v15.23.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.22.2 + image: frappe/erpnext:v15.23.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.22.2 + image: frappe/erpnext:v15.23.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.22.2 + image: frappe/erpnext:v15.23.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.22.2 + image: frappe/erpnext:v15.23.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.22.2 + image: frappe/erpnext:v15.23.0 deploy: restart_policy: condition: on-failure From 9c3251a72206a6dd081afcb6499b366e776717e6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 13 May 2024 11:33:31 +0000 Subject: [PATCH 070/193] 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 089064f5..0cc52a34 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.23.0 +ERPNEXT_VERSION=v15.23.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a89694b4..cdee8c26 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.23.0 + image: frappe/erpnext:v15.23.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.23.0 + image: frappe/erpnext:v15.23.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.23.0 + image: frappe/erpnext:v15.23.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.23.0 + image: frappe/erpnext:v15.23.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.23.0 + image: frappe/erpnext:v15.23.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.23.0 + image: frappe/erpnext:v15.23.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.23.0 + image: frappe/erpnext:v15.23.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.23.0 + image: frappe/erpnext:v15.23.1 deploy: restart_policy: condition: on-failure From 5d950887fe42b2c30abae52446706d403b5d22a2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 15 May 2024 05:21:04 +0000 Subject: [PATCH 071/193] 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 0cc52a34..9d713a8f 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.23.1 +ERPNEXT_VERSION=v15.23.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index cdee8c26..3046b7fb 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.23.1 + image: frappe/erpnext:v15.23.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.23.1 + image: frappe/erpnext:v15.23.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.23.1 + image: frappe/erpnext:v15.23.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.23.1 + image: frappe/erpnext:v15.23.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.23.1 + image: frappe/erpnext:v15.23.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.23.1 + image: frappe/erpnext:v15.23.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.23.1 + image: frappe/erpnext:v15.23.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.23.1 + image: frappe/erpnext:v15.23.2 deploy: restart_policy: condition: on-failure From bef73253c7c126a64b4f6a4534a8dbf0bbf35d32 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 15 May 2024 13:35:41 +0000 Subject: [PATCH 072/193] 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 9d713a8f..f113093a 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.23.2 +ERPNEXT_VERSION=v15.23.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3046b7fb..7b47e48b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.23.2 + image: frappe/erpnext:v15.23.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.23.2 + image: frappe/erpnext:v15.23.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.23.2 + image: frappe/erpnext:v15.23.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.23.2 + image: frappe/erpnext:v15.23.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.23.2 + image: frappe/erpnext:v15.23.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.23.2 + image: frappe/erpnext:v15.23.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.23.2 + image: frappe/erpnext:v15.23.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.23.2 + image: frappe/erpnext:v15.23.3 deploy: restart_policy: condition: on-failure From e2b3fa301e22755cbaf7670771e3ed25f26f300f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 17 May 2024 05:36:30 +0000 Subject: [PATCH 073/193] 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 f113093a..b53ea9f8 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.23.3 +ERPNEXT_VERSION=v15.24.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7b47e48b..36b41bb0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.23.3 + image: frappe/erpnext:v15.24.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.23.3 + image: frappe/erpnext:v15.24.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.23.3 + image: frappe/erpnext:v15.24.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.23.3 + image: frappe/erpnext:v15.24.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.23.3 + image: frappe/erpnext:v15.24.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.23.3 + image: frappe/erpnext:v15.24.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.23.3 + image: frappe/erpnext:v15.24.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.23.3 + image: frappe/erpnext:v15.24.0 deploy: restart_policy: condition: on-failure From 694f258b1fbebc1cc99f00dbb42d53dfeccb38e0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 20 May 2024 10:31:57 +0000 Subject: [PATCH 074/193] 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 b53ea9f8..76663f86 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.24.0 +ERPNEXT_VERSION=v15.24.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 36b41bb0..58d2c81e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.24.0 + image: frappe/erpnext:v15.24.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.24.0 + image: frappe/erpnext:v15.24.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.24.0 + image: frappe/erpnext:v15.24.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.24.0 + image: frappe/erpnext:v15.24.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.24.0 + image: frappe/erpnext:v15.24.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.24.0 + image: frappe/erpnext:v15.24.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.24.0 + image: frappe/erpnext:v15.24.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.24.0 + image: frappe/erpnext:v15.24.1 deploy: restart_policy: condition: on-failure From 0c41f01441c2716a32c32bfcbcc57b5351cc5b1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 14:21:21 +0530 Subject: [PATCH 075/193] chore(deps): bump pytest from 8.2.0 to 8.2.1 (#1397) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.0 to 8.2.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/8.2.0...8.2.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 15d066af..953e1941 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.2.0 +pytest==8.2.1 From 48d9e1a6cab3fcb052c1a7cfe8fe7e3436145d7d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 22 May 2024 08:55:20 +0000 Subject: [PATCH 076/193] 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 76663f86..4c437093 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.24.1 +ERPNEXT_VERSION=v15.25.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 58d2c81e..a42c2d76 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.24.1 + image: frappe/erpnext:v15.25.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.24.1 + image: frappe/erpnext:v15.25.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.24.1 + image: frappe/erpnext:v15.25.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.24.1 + image: frappe/erpnext:v15.25.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.24.1 + image: frappe/erpnext:v15.25.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.24.1 + image: frappe/erpnext:v15.25.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.24.1 + image: frappe/erpnext:v15.25.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.24.1 + image: frappe/erpnext:v15.25.0 deploy: restart_policy: condition: on-failure From 40c1f97823260f4185be17afa702047b5ec71175 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 14:06:15 +0530 Subject: [PATCH 077/193] chore(deps): Update pre-commit hooks (#1398) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 72fbce64..033ab238 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: - id: prettier - repo: https://github.com/codespell-project/codespell - rev: v2.2.6 + rev: v2.3.0 hooks: - id: codespell args: From 855ce6cb0b8a3e545fa878d922e44f4f7d2738f3 Mon Sep 17 00:00:00 2001 From: Anthony Date: Tue, 28 May 2024 09:36:49 -0400 Subject: [PATCH 078/193] Update single-server-example.md (#1401) Fix nonworking step - hashed password fails - per https://discuss.frappe.io/t/frappe-docker-unable-to-log-in-into-traefik/123077 --- 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 35cf54d7..1bc2c2b1 100644 --- a/docs/single-server-example.md +++ b/docs/single-server-example.md @@ -65,7 +65,7 @@ Create a file called `traefik.env` in `~/gitops` ```shell echo 'TRAEFIK_DOMAIN=traefik.example.com' > ~/gitops/traefik.env echo 'EMAIL=admin@example.com' >> ~/gitops/traefik.env -echo 'HASHED_PASSWORD='$(openssl passwd -apr1 changeit | sed 's/\$/\\\$/g') >> ~/gitops/traefik.env +echo 'HASHED_PASSWORD='$(openssl passwd -apr1 changeit | sed -e s/\\$/\\$\\$/g) >> ~/gitops/traefik.env ``` Note: From ce16c6365c5c415075019594594acafcc455c21b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 29 May 2024 08:01:20 +0000 Subject: [PATCH 079/193] 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 4c437093..4981aa45 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.25.0 +ERPNEXT_VERSION=v15.26.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a42c2d76..f371d177 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.25.0 + image: frappe/erpnext:v15.26.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.25.0 + image: frappe/erpnext:v15.26.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.25.0 + image: frappe/erpnext:v15.26.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.25.0 + image: frappe/erpnext:v15.26.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.25.0 + image: frappe/erpnext:v15.26.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.25.0 + image: frappe/erpnext:v15.26.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.25.0 + image: frappe/erpnext:v15.26.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.25.0 + image: frappe/erpnext:v15.26.0 deploy: restart_policy: condition: on-failure From 408d853b2035f21d92a5d82a6df0c23a1bd6c998 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 30 May 2024 14:06:07 +0000 Subject: [PATCH 080/193] 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 4981aa45..ca173ba1 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.26.0 +ERPNEXT_VERSION=v15.26.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f371d177..3a6bceb0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.26.0 + image: frappe/erpnext:v15.26.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.26.0 + image: frappe/erpnext:v15.26.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.26.0 + image: frappe/erpnext:v15.26.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.26.0 + image: frappe/erpnext:v15.26.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.26.0 + image: frappe/erpnext:v15.26.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.26.0 + image: frappe/erpnext:v15.26.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.26.0 + image: frappe/erpnext:v15.26.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.26.0 + image: frappe/erpnext:v15.26.1 deploy: restart_policy: condition: on-failure From 943fe9605e29514bd53971b119e8a006cff5aa90 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Jun 2024 01:26:41 +0000 Subject: [PATCH 081/193] 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 ca173ba1..1006f249 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.26.1 +ERPNEXT_VERSION=v15.27.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3a6bceb0..914c7a77 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.26.1 + image: frappe/erpnext:v15.27.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.26.1 + image: frappe/erpnext:v15.27.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.26.1 + image: frappe/erpnext:v15.27.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.26.1 + image: frappe/erpnext:v15.27.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.26.1 + image: frappe/erpnext:v15.27.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.26.1 + image: frappe/erpnext:v15.27.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.26.1 + image: frappe/erpnext:v15.27.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.26.1 + image: frappe/erpnext:v15.27.0 deploy: restart_policy: condition: on-failure From 9da4d22dd7cded70fc93940cc9aa464335353a08 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 6 Jun 2024 12:29:57 +0000 Subject: [PATCH 082/193] 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 1006f249..bfc859d2 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.27.0 +ERPNEXT_VERSION=v15.27.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 914c7a77..209dfb43 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.27.0 + image: frappe/erpnext:v15.27.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.27.0 + image: frappe/erpnext:v15.27.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.27.0 + image: frappe/erpnext:v15.27.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.27.0 + image: frappe/erpnext:v15.27.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.27.0 + image: frappe/erpnext:v15.27.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.27.0 + image: frappe/erpnext:v15.27.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.27.0 + image: frappe/erpnext:v15.27.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.27.0 + image: frappe/erpnext:v15.27.1 deploy: restart_policy: condition: on-failure From fa543662eda3f63bf844e6a179601c5444c85c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yeifer=20Alexander=20Mu=C3=B1oz=20Torres?= <149745077+yeifer-co@users.noreply.github.com> Date: Fri, 7 Jun 2024 13:51:17 -0500 Subject: [PATCH 083/193] #1402 Environment variables for custom image (#1403) * chore: enhance compose.yaml with variables for customize * chore: use default blank values for db and redis variables in compose.yaml * chore: Use env var for HTTP(S) publish ports in overrides * docs: explain use of environment variables for image customization * chore: use ERPNEXT_VERSION as default * docs: fixed spelling errors --- CODE_OF_CONDUCT.md | 2 +- compose.yaml | 11 ++++++----- docs/custom-apps.md | 30 +++++++++++++++++++++++++----- overrides/compose.https.yaml | 4 ++-- overrides/compose.noproxy.yaml | 2 +- overrides/compose.proxy.yaml | 2 +- overrides/compose.traefik-ssl.yaml | 2 +- overrides/compose.traefik.yaml | 2 +- 8 files changed, 38 insertions(+), 17 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 55c27d81..0e01dd85 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, -level of experience, education, socio-economic status, nationality, personal +level of experience, education, socioeconomic status, nationality, personal appearance, race, religion, or sexual identity and orientation. ## Our Standards diff --git a/compose.yaml b/compose.yaml index be9fe7ea..d9aa6ee1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -2,7 +2,8 @@ x-customizable-image: &customizable_image # By default the image used only contains the `frappe` and `erpnext` apps. # See https://github.com/frappe/frappe_docker/blob/main/docs/custom-apps.md # about using custom images. - image: frappe/erpnext:${ERPNEXT_VERSION:?No ERPNext version set} + image: ${CUSTOM_IMAGE:-frappe/erpnext}:${CUSTOM_TAG:-${ERPNEXT_VERSION:?No ERPNext version or tag set}} + pull_policy: ${PULL_POLICY:-always} x-depends-on-configurator: &depends_on_configurator depends_on: @@ -32,10 +33,10 @@ services: 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} + DB_HOST: ${DB_HOST:-} + DB_PORT: ${DB_PORT:-} + REDIS_CACHE: ${REDIS_CACHE:-} + REDIS_QUEUE: ${REDIS_QUEUE:-} SOCKETIO_PORT: 9000 depends_on: {} diff --git a/docs/custom-apps.md b/docs/custom-apps.md index bc5194dd..f33aa3c7 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -104,14 +104,34 @@ More about [kaniko](https://github.com/GoogleContainerTools/kaniko) ### Use Images -On the [compose.yaml](../compose.yaml) replace the image reference to the `tag` you used when you built it. Then, if you used a tag like `custom_erpnext:staging` the `x-customizable-image` section will look like this: +In the [compose.yaml](../compose.yaml), you can set the image name and tag through environment variables, making it easier to customize. -``` +```yaml x-customizable-image: &customizable_image - image: custom_erpnext:staging - pull_policy: never + image: ${CUSTOM_IMAGE:-frappe/erpnext}:${CUSTOM_TAG:-${ERPNEXT_VERSION:?No ERPNext version or tag set}} + pull_policy: ${PULL_POLICY:-always} ``` -The `pull_policy` above is optional and prevents `docker` to try to download the image when that one has been built locally. +The environment variables can be set in the shell or in the .env file as [setup-options.md](setup-options.md) describes. + +- `CUSTOM_IMAGE`: The name of your custom image. Defaults to `frappe/erpnext` if not set. +- `CUSTOM_TAG`: The tag for your custom image. Must be set if `CUSTOM_IMAGE` is used. Defaults to the value of `ERPNEXT_VERSION` if not set. +- `PULL_POLICY`: The Docker pull policy. Defaults to `always`. Recommended set to `never` for local images, so prevent `docker` from trying to download the image when it has been built locally. +- `HTTP_PUBLISH_PORT`: The port to publish through no SSL channel. Default depending on deployment, it may be `80` if SSL activated or `8080` if not. +- `HTTPS_PUBLISH_PORT`: The secure port to publish using SSL. Default is `443`. Make sure image name is correct to be pushed to registry. After the images are pushed, you can pull them to servers to be deployed. If the registry is private, additional auth is needed. + +#### Example + +If you built an image with the tag `ghcr.io/user/repo/custom:1.0.0`, you would set the environment variables as follows: + +```bash +export CUSTOM_IMAGE='ghcr.io/user/repo/custom' +export CUSTOM_TAG='1.0.0' +docker compose -f compose.yaml \ + -f overrides/compose.mariadb.yaml \ + -f overrides/compose.redis.yaml \ + -f overrides/compose.https.yaml \ + config > ~/gitops/docker-compose.yaml +``` diff --git a/overrides/compose.https.yaml b/overrides/compose.https.yaml index a34e2d3c..aa17a68e 100644 --- a/overrides/compose.https.yaml +++ b/overrides/compose.https.yaml @@ -21,8 +21,8 @@ services: - --certificatesResolvers.main-resolver.acme.email=${LETSENCRYPT_EMAIL:?No Let's Encrypt email set} - --certificatesResolvers.main-resolver.acme.storage=/letsencrypt/acme.json ports: - - 80:80 - - 443:443 + - ${HTTP_PUBLISH_PORT:-80}:80 + - ${HTTPS_PUBLISH_PORT:-443}:443 volumes: - cert-data:/letsencrypt - /var/run/docker.sock:/var/run/docker.sock:ro diff --git a/overrides/compose.noproxy.yaml b/overrides/compose.noproxy.yaml index 5c4f83c0..23239ff2 100644 --- a/overrides/compose.noproxy.yaml +++ b/overrides/compose.noproxy.yaml @@ -1,4 +1,4 @@ services: frontend: ports: - - 8080:8080 + - ${HTTP_PUBLISH_PORT:-8080}:8080 diff --git a/overrides/compose.proxy.yaml b/overrides/compose.proxy.yaml index d2dc319a..c887ffa5 100644 --- a/overrides/compose.proxy.yaml +++ b/overrides/compose.proxy.yaml @@ -13,7 +13,7 @@ services: - --providers.docker.exposedbydefault=false - --entrypoints.web.address=:80 ports: - - 80:80 + - ${HTTP_PUBLISH_PORT:-80}:80 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro userns_mode: host diff --git a/overrides/compose.traefik-ssl.yaml b/overrides/compose.traefik-ssl.yaml index 0c0a9b84..be996f54 100644 --- a/overrides/compose.traefik-ssl.yaml +++ b/overrides/compose.traefik-ssl.yaml @@ -40,7 +40,7 @@ services: # Enable the Dashboard and API - --api ports: - - 443:443 + - ${HTTPS_PUBLISH_PORT:-443}:443 volumes: - cert-data:/certificates diff --git a/overrides/compose.traefik.yaml b/overrides/compose.traefik.yaml index f3e64f6c..1e4432ff 100644 --- a/overrides/compose.traefik.yaml +++ b/overrides/compose.traefik.yaml @@ -35,7 +35,7 @@ services: # Enable the Dashboard and API - --api ports: - - 80:80 + - ${HTTP_PUBLISH_PORT:-80}:80 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro networks: From 63b3251312f86211d4353d7c503b6044effd1e7a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 04:19:45 +0530 Subject: [PATCH 084/193] chore(deps): Update pre-commit hooks (#1408) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 033ab238..61387bbe 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.15.2 + rev: v3.16.0 hooks: - id: pyupgrade args: [--py37-plus] From 855c4f62cc377f237a6102b9600bcdc9c27efe31 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 10 Jun 2024 05:04:01 +0000 Subject: [PATCH 085/193] 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 bfc859d2..2a70f2cc 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.27.1 +ERPNEXT_VERSION=v15.27.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 209dfb43..f75ec5fa 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.27.1 + image: frappe/erpnext:v15.27.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.27.1 + image: frappe/erpnext:v15.27.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.27.1 + image: frappe/erpnext:v15.27.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.27.1 + image: frappe/erpnext:v15.27.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.27.1 + image: frappe/erpnext:v15.27.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.27.1 + image: frappe/erpnext:v15.27.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.27.1 + image: frappe/erpnext:v15.27.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.27.1 + image: frappe/erpnext:v15.27.2 deploy: restart_policy: condition: on-failure From 281c072e77c72d0233226eceecefed459d3650b2 Mon Sep 17 00:00:00 2001 From: Chev91 <107302692+Chev91@users.noreply.github.com> Date: Mon, 10 Jun 2024 08:51:58 +0200 Subject: [PATCH 086/193] fix: make docs more explicit for beginners (#1409) --- README.md | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 43816c84..4998d3bd 100644 --- a/README.md +++ b/README.md @@ -6,21 +6,34 @@ Everything about [Frappe](https://github.com/frappe/frappe) and [ERPNext](https: # Getting Started To get started you need [Docker](https://docs.docker.com/get-docker/), [docker-compose](https://docs.docker.com/compose/), and [git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git) setup on your machine. For Docker basics and best practices refer to Docker's [documentation](http://docs.docker.com). -After that, clone this repo: + +Once completed, chose one of the following two sections for next steps. + +### Try in Play With Docker + +To play in an already set up sandbox, in your browser, click the button below: + + + Try in PWD + + +### Try on your Dev environment + +First clone the repo: ```sh git clone https://github.com/frappe/frappe_docker cd frappe_docker ``` -### Try in Play With Docker +Then run: `docker compose -f pwd.yml -d` - - Try in PWD - +## Final steps Wait for 5 minutes for ERPNext site to be created or check `create-site` container logs before opening browser on port 8080. (username: `Administrator`, password: `admin`) +If you ran in a Dev Docker environment, to view container logs: `docker compose -f pwd.yml -d`. Don't worry about some of the initial error messages, some services take a while to become ready, and then they go away. + # Documentation ### [Production](#production) From f3890a8ddc0855bd1b46f358262830c6fbbf70d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:22:17 +0530 Subject: [PATCH 087/193] chore(deps): bump pytest from 8.2.1 to 8.2.2 (#1406) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.1 to 8.2.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/8.2.1...8.2.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 953e1941..c75731e6 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.2.1 +pytest==8.2.2 From 10e28f4d9dd116fa0a1e98306e94988a99abf747 Mon Sep 17 00:00:00 2001 From: Himanshu Shivhare Date: Mon, 10 Jun 2024 12:22:49 +0530 Subject: [PATCH 088/193] hyperlink updated (#1407) --- docs/environment-variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/environment-variables.md b/docs/environment-variables.md index 0101fcbd..1dd5eae9 100644 --- a/docs/environment-variables.md +++ b/docs/environment-variables.md @@ -43,7 +43,7 @@ Hostname for redis server to store queue data and socketio. Set only if external ### `ERPNEXT_VERSION` -ERPNext [release](https://github.com/frappe/frappe/releases). This variable is required if you use ERPNext override. +ERPNext [release](https://github.com/frappe/erpnext/releases). This variable is required if you use ERPNext override. ### `LETSENCRYPT_EMAIL` From 38a0b1fae27f5e20a48b8828e056e4bba4761fa3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 11 Jun 2024 09:59:42 +0000 Subject: [PATCH 089/193] 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 2a70f2cc..a71fc625 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.27.2 +ERPNEXT_VERSION=v15.27.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f75ec5fa..f0af6867 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.27.2 + image: frappe/erpnext:v15.27.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.27.2 + image: frappe/erpnext:v15.27.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.27.2 + image: frappe/erpnext:v15.27.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.27.2 + image: frappe/erpnext:v15.27.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.27.2 + image: frappe/erpnext:v15.27.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.27.2 + image: frappe/erpnext:v15.27.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.27.2 + image: frappe/erpnext:v15.27.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.27.2 + image: frappe/erpnext:v15.27.3 deploy: restart_policy: condition: on-failure From ab3f6eab399a1a19e594cb808b39cfc3aabff8be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 15:38:42 +0530 Subject: [PATCH 090/193] chore(deps): bump docker/bake-action from 4.5.0 to 4.6.0 (#1411) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 4.5.0 to 4.6.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v4.5.0...v4.6.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 e9d984dd..7bdb3300 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.5.0 + uses: docker/bake-action@v4.6.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.5.0 + uses: docker/bake-action@v4.6.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 28f8c33e..6f7848c4 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.5.0 + uses: docker/bake-action@v4.6.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v4.5.0 + uses: docker/bake-action@v4.6.0 with: push: true From 7fe7114ac8a708c61b5ac44fd51da09cfdc69d34 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 11 Jun 2024 13:23:14 +0000 Subject: [PATCH 091/193] 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 a71fc625..286402ee 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.27.3 +ERPNEXT_VERSION=v15.27.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f0af6867..55e30e76 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.27.3 + image: frappe/erpnext:v15.27.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.27.3 + image: frappe/erpnext:v15.27.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.27.3 + image: frappe/erpnext:v15.27.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.27.3 + image: frappe/erpnext:v15.27.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.27.3 + image: frappe/erpnext:v15.27.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.27.3 + image: frappe/erpnext:v15.27.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.27.3 + image: frappe/erpnext:v15.27.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.27.3 + image: frappe/erpnext:v15.27.4 deploy: restart_policy: condition: on-failure From d92503dec400e8794b937b586a98463d72fd3cc8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Jun 2024 11:41:56 +0000 Subject: [PATCH 092/193] 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 286402ee..ca631d24 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.27.4 +ERPNEXT_VERSION=v15.27.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 55e30e76..849120cd 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.27.4 + image: frappe/erpnext:v15.27.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.27.4 + image: frappe/erpnext:v15.27.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.27.4 + image: frappe/erpnext:v15.27.5 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.27.4 + image: frappe/erpnext:v15.27.5 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.27.4 + image: frappe/erpnext:v15.27.5 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.27.4 + image: frappe/erpnext:v15.27.5 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.27.4 + image: frappe/erpnext:v15.27.5 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.27.4 + image: frappe/erpnext:v15.27.5 deploy: restart_policy: condition: on-failure From a495cc8c0a0cc1faa916f6a4efb1f1305edbb85a Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Jun 2024 12:03:06 +0000 Subject: [PATCH 093/193] 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 ca631d24..318dae16 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.27.5 +ERPNEXT_VERSION=v15.27.6 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 849120cd..de59d6a2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.27.5 + image: frappe/erpnext:v15.27.6 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.27.5 + image: frappe/erpnext:v15.27.6 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.27.5 + image: frappe/erpnext:v15.27.6 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.27.5 + image: frappe/erpnext:v15.27.6 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.27.5 + image: frappe/erpnext:v15.27.6 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.27.5 + image: frappe/erpnext:v15.27.6 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.27.5 + image: frappe/erpnext:v15.27.6 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.27.5 + image: frappe/erpnext:v15.27.6 deploy: restart_policy: condition: on-failure From bec5cc97e11248450523929b26d44b1d2aad1757 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Jun 2024 06:34:37 +0000 Subject: [PATCH 094/193] 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 318dae16..181781c3 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.27.6 +ERPNEXT_VERSION=v15.27.7 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index de59d6a2..434e5743 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.27.6 + image: frappe/erpnext:v15.27.7 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.27.6 + image: frappe/erpnext:v15.27.7 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.27.6 + image: frappe/erpnext:v15.27.7 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.27.6 + image: frappe/erpnext:v15.27.7 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.27.6 + image: frappe/erpnext:v15.27.7 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.27.6 + image: frappe/erpnext:v15.27.7 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.27.6 + image: frappe/erpnext:v15.27.7 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.27.6 + image: frappe/erpnext:v15.27.7 deploy: restart_policy: condition: on-failure From e1c924820ffccd799a7b624a82dcc61e69a328db Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 Jun 2024 05:57:54 +0000 Subject: [PATCH 095/193] 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 181781c3..87237b85 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.27.7 +ERPNEXT_VERSION=v15.28.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 434e5743..36f76c16 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.27.7 + image: frappe/erpnext:v15.28.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.27.7 + image: frappe/erpnext:v15.28.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.27.7 + image: frappe/erpnext:v15.28.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.27.7 + image: frappe/erpnext:v15.28.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.27.7 + image: frappe/erpnext:v15.28.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.27.7 + image: frappe/erpnext:v15.28.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.27.7 + image: frappe/erpnext:v15.28.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.27.7 + image: frappe/erpnext:v15.28.0 deploy: restart_policy: condition: on-failure From 507bbe2274dfbd186cbe64049ac8c8c315ff3de4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:35:22 +0530 Subject: [PATCH 096/193] chore(deps): bump docker/bake-action from 4.6.0 to 5.1.0 (#1420) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 4.6.0 to 5.1.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v4.6.0...v5.1.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 7bdb3300..4b2c149d 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.6.0 + uses: docker/bake-action@v5.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.6.0 + uses: docker/bake-action@v5.1.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 6f7848c4..fc2d85db 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.6.0 + uses: docker/bake-action@v5.1.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v4.6.0 + uses: docker/bake-action@v5.1.0 with: push: true From 6c798cfb2bcbdfa5e9a344503588ddaf504ba49c Mon Sep 17 00:00:00 2001 From: Chev91 <107302692+Chev91@users.noreply.github.com> Date: Tue, 25 Jun 2024 07:06:25 +0200 Subject: [PATCH 097/193] Update docker-compose.yml (#1415) A challenge I encountered while setting up the Development instance. The command 'bench init --skip-redis-config-generation frappe-bench' kept generating errors, which I discovered were due to an architecture mismatch between Docker and macOS. By updating the platform to linux/amd64 in my code, I was able to resolve this issue. --- devcontainer-example/docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index e27b8daa..3df5c417 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -2,6 +2,7 @@ version: "3.7" services: mariadb: image: docker.io/mariadb:10.6 + platform: linux/amd64 command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci @@ -37,12 +38,15 @@ services: redis-cache: image: docker.io/redis:alpine + platform: linux/amd64 redis-queue: image: docker.io/redis:alpine + platform: linux/amd64 frappe: image: docker.io/frappe/bench:latest + platform: linux/amd64 command: sleep infinity environment: - SHELL=/bin/bash From 6c7fe3de7f104b23af1d561a57f15ec17b07b937 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 28 Jun 2024 09:28:59 +0000 Subject: [PATCH 098/193] 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 87237b85..e0baec4a 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.28.0 +ERPNEXT_VERSION=v15.28.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 36f76c16..8c884e83 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.28.0 + image: frappe/erpnext:v15.28.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.28.0 + image: frappe/erpnext:v15.28.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.28.0 + image: frappe/erpnext:v15.28.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.28.0 + image: frappe/erpnext:v15.28.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.28.0 + image: frappe/erpnext:v15.28.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.28.0 + image: frappe/erpnext:v15.28.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.28.0 + image: frappe/erpnext:v15.28.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.28.0 + image: frappe/erpnext:v15.28.1 deploy: restart_policy: condition: on-failure From 0e2d4eb50d028229efefbe35b661e4c8e587cfff Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 29 Jun 2024 16:27:27 +0000 Subject: [PATCH 099/193] 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 e0baec4a..bc677f3d 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.28.1 +ERPNEXT_VERSION=v15.28.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8c884e83..cd84a00d 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.28.1 + image: frappe/erpnext:v15.28.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.28.1 + image: frappe/erpnext:v15.28.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.28.1 + image: frappe/erpnext:v15.28.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.28.1 + image: frappe/erpnext:v15.28.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.28.1 + image: frappe/erpnext:v15.28.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.28.1 + image: frappe/erpnext:v15.28.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.28.1 + image: frappe/erpnext:v15.28.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.28.1 + image: frappe/erpnext:v15.28.2 deploy: restart_policy: condition: on-failure From 484ff82e713d6166e0eff9b59141b5afa8a0d578 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2024 04:11:52 +0530 Subject: [PATCH 100/193] chore(deps): bump docker/bake-action from 5.1.0 to 5.2.0 (#1422) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.1.0...v5.2.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 4b2c149d..77c012d8 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@v5.1.0 + uses: docker/bake-action@v5.2.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@v5.1.0 + uses: docker/bake-action@v5.2.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index fc2d85db..15889668 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@v5.1.0 + uses: docker/bake-action@v5.2.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.1.0 + uses: docker/bake-action@v5.2.0 with: push: true From c1ee06b6ef10b556bca3078fa5692dabeb8cfe65 Mon Sep 17 00:00:00 2001 From: vama Date: Sun, 30 Jun 2024 04:12:24 +0530 Subject: [PATCH 101/193] Update README.md (#1423) updated docker compose command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4998d3bd..c341160e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ git clone https://github.com/frappe/frappe_docker cd frappe_docker ``` -Then run: `docker compose -f pwd.yml -d` +Then run: `docker compose -f pwd.yml up -d` ## Final steps From 22ca64c20795e131945d9509addd367db3ebba4f Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 3 Jul 2024 05:11:40 +0000 Subject: [PATCH 102/193] 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 bc677f3d..e65f6fe6 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.28.2 +ERPNEXT_VERSION=v15.29.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index cd84a00d..a873f649 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.28.2 + image: frappe/erpnext:v15.29.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.28.2 + image: frappe/erpnext:v15.29.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.28.2 + image: frappe/erpnext:v15.29.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.28.2 + image: frappe/erpnext:v15.29.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.28.2 + image: frappe/erpnext:v15.29.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.28.2 + image: frappe/erpnext:v15.29.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.28.2 + image: frappe/erpnext:v15.29.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.28.2 + image: frappe/erpnext:v15.29.0 deploy: restart_policy: condition: on-failure From 83599aec2381f483c11b00e60080dd31ac726a02 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 3 Jul 2024 15:04:42 +0000 Subject: [PATCH 103/193] 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 e65f6fe6..075ea349 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.29.0 +ERPNEXT_VERSION=v15.29.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a873f649..a4ba5d65 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.29.0 + image: frappe/erpnext:v15.29.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.29.0 + image: frappe/erpnext:v15.29.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.29.0 + image: frappe/erpnext:v15.29.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.29.0 + image: frappe/erpnext:v15.29.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.29.0 + image: frappe/erpnext:v15.29.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.29.0 + image: frappe/erpnext:v15.29.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.29.0 + image: frappe/erpnext:v15.29.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.29.0 + image: frappe/erpnext:v15.29.1 deploy: restart_policy: condition: on-failure From 74b2bca9bfae8206067d5d0ebcbc7bc971a05383 Mon Sep 17 00:00:00 2001 From: gp <370905+gparent@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:19:10 -0400 Subject: [PATCH 104/193] Fix: WARN: FromAsCasing: 'as' and 'FROM' keywords' casing do not match (#1426) --- images/bench/Dockerfile | 4 ++-- images/custom/Containerfile | 2 +- images/production/Containerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index ec7078e2..b342aa1a 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim as bench +FROM debian:bookworm-slim AS bench LABEL author=frappé @@ -145,7 +145,7 @@ RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | EXPOSE 8000-8005 9000-9005 6787 -FROM bench as bench-test +FROM bench AS bench-test # Print version and verify bashrc is properly sourced so that everything works # in the interactive shell and Dockerfile diff --git a/images/custom/Containerfile b/images/custom/Containerfile index e7d281fc..127e31f4 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -130,7 +130,7 @@ RUN export APP_INSTALL_ARGS="" && \ echo "{}" > sites/common_site_config.json && \ find apps -mindepth 1 -path "*/.git" | xargs rm -fr -FROM base as backend +FROM base AS backend USER frappe diff --git a/images/production/Containerfile b/images/production/Containerfile index c4eeff8b..7e207747 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -115,7 +115,7 @@ RUN bench init \ echo "{}" > sites/common_site_config.json && \ find apps -mindepth 1 -path "*/.git" | xargs rm -fr -FROM base as erpnext +FROM base AS erpnext USER frappe From 0631489d25e5ddd6fb09f8c26873b71ab03b69c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 09:50:07 +0530 Subject: [PATCH 105/193] chore(deps): bump docker/bake-action from 5.2.0 to 5.3.0 (#1427) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.2.0...v5.3.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 77c012d8..ff6fd666 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@v5.2.0 + uses: docker/bake-action@v5.3.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@v5.2.0 + uses: docker/bake-action@v5.3.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 15889668..e78225c5 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@v5.2.0 + uses: docker/bake-action@v5.3.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.2.0 + uses: docker/bake-action@v5.3.0 with: push: true From d91ea066fb2638e96c99529b80a719d6364ec1f7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 5 Jul 2024 02:55:39 +0000 Subject: [PATCH 106/193] 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 075ea349..5d060d33 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.29.1 +ERPNEXT_VERSION=v15.29.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a4ba5d65..348c60bd 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.29.1 + image: frappe/erpnext:v15.29.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.29.1 + image: frappe/erpnext:v15.29.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.29.1 + image: frappe/erpnext:v15.29.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.29.1 + image: frappe/erpnext:v15.29.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.29.1 + image: frappe/erpnext:v15.29.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.29.1 + image: frappe/erpnext:v15.29.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.29.1 + image: frappe/erpnext:v15.29.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.29.1 + image: frappe/erpnext:v15.29.2 deploy: restart_policy: condition: on-failure From a9dbb0ef87691ee14c599d6eeda53ec2b5f9029f Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 Jul 2024 10:52:14 +0000 Subject: [PATCH 107/193] 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 5d060d33..e3ce1ee7 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.29.2 +ERPNEXT_VERSION=v15.29.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 348c60bd..38ac7049 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.29.2 + image: frappe/erpnext:v15.29.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.29.2 + image: frappe/erpnext:v15.29.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.29.2 + image: frappe/erpnext:v15.29.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.29.2 + image: frappe/erpnext:v15.29.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.29.2 + image: frappe/erpnext:v15.29.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.29.2 + image: frappe/erpnext:v15.29.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.29.2 + image: frappe/erpnext:v15.29.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.29.2 + image: frappe/erpnext:v15.29.3 deploy: restart_policy: condition: on-failure From 87782bbdf350feadc6aff298a3d5a6e84ac7b6a0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 13 Jul 2024 05:27:22 +0000 Subject: [PATCH 108/193] 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 e3ce1ee7..d76e7c59 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.29.3 +ERPNEXT_VERSION=v15.29.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 38ac7049..336ebf96 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.29.3 + image: frappe/erpnext:v15.29.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.29.3 + image: frappe/erpnext:v15.29.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.29.3 + image: frappe/erpnext:v15.29.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.29.3 + image: frappe/erpnext:v15.29.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.29.3 + image: frappe/erpnext:v15.29.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.29.3 + image: frappe/erpnext:v15.29.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.29.3 + image: frappe/erpnext:v15.29.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.29.3 + image: frappe/erpnext:v15.29.4 deploy: restart_policy: condition: on-failure From 6ea76cd7a12a523f15c88c8f16326c4d3893f209 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 17 Jul 2024 05:20:13 +0000 Subject: [PATCH 109/193] 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 d76e7c59..694eb7ac 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.29.4 +ERPNEXT_VERSION=v15.30.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 336ebf96..fc98798a 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.29.4 + image: frappe/erpnext:v15.30.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.29.4 + image: frappe/erpnext:v15.30.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.29.4 + image: frappe/erpnext:v15.30.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.29.4 + image: frappe/erpnext:v15.30.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.29.4 + image: frappe/erpnext:v15.30.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.29.4 + image: frappe/erpnext:v15.30.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.29.4 + image: frappe/erpnext:v15.30.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.29.4 + image: frappe/erpnext:v15.30.0 deploy: restart_policy: condition: on-failure From 9af0cfdf81b3fdcbf565cddcdd6a445953364396 Mon Sep 17 00:00:00 2001 From: gp <370905+gparent@users.noreply.github.com> Date: Mon, 22 Jul 2024 04:15:50 -0400 Subject: [PATCH 110/193] Fix: LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (#1435) --- images/bench/Dockerfile | 10 +++++----- images/custom/Containerfile | 2 +- images/production/Containerfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index b342aa1a..8281e255 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -98,8 +98,8 @@ WORKDIR /home/frappe # Install Python via pyenv 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 +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 \ @@ -114,7 +114,7 @@ RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \ # Clone and install bench in the local user home directory # For development, bench source is located in ~/.bench -ENV PATH /home/frappe/.local/bin:$PATH +ENV PATH=/home/frappe/.local/bin:$PATH # Skip editable-bench warning # https://github.com/frappe/bench/commit/20560c97c4246b2480d7358c722bc9ad13606138 RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \ @@ -125,8 +125,8 @@ RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \ # Install Node via nvm 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} +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.5/install.sh | bash \ && . ${NVM_DIR}/nvm.sh \ diff --git a/images/custom/Containerfile b/images/custom/Containerfile index 127e31f4..a35b93fe 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -9,7 +9,7 @@ ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm ARG NODE_VERSION=18.18.2 ENV NVM_DIR=/home/frappe/.nvm -ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} +ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} RUN useradd -ms /bin/bash frappe \ && apt-get update \ diff --git a/images/production/Containerfile b/images/production/Containerfile index 7e207747..dc13262d 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -6,7 +6,7 @@ ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm ARG NODE_VERSION=18.18.2 ENV NVM_DIR=/home/frappe/.nvm -ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} +ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} RUN useradd -ms /bin/bash frappe \ && apt-get update \ From c08851ecdc2447e90d9a93249a8428b2e8db33d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 13:46:16 +0530 Subject: [PATCH 111/193] chore(deps): bump docker/bake-action from 5.3.0 to 5.4.0 (#1436) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.3.0...v5.4.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 ff6fd666..28d53c1e 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@v5.3.0 + uses: docker/bake-action@v5.4.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@v5.3.0 + uses: docker/bake-action@v5.4.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index e78225c5..eccda650 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@v5.3.0 + uses: docker/bake-action@v5.4.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.3.0 + uses: docker/bake-action@v5.4.0 with: push: true From 3aa10ee4354327bf1bdc0d172c4f9a76f29a984e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 04:53:23 +0530 Subject: [PATCH 112/193] chore(deps): bump pytest from 8.2.2 to 8.3.1 (#1442) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.2 to 8.3.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/8.2.2...8.3.1) --- updated-dependencies: - dependency-name: pytest 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> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index c75731e6..befd7183 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.2.2 +pytest==8.3.1 From 431d31df00f585bcc181aaea37568227d81c0270 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 04:53:39 +0530 Subject: [PATCH 113/193] chore(deps): bump docker/bake-action from 5.4.0 to 5.5.0 (#1444) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.4.0 to 5.5.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.4.0...v5.5.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 28d53c1e..7a99cd80 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@v5.4.0 + uses: docker/bake-action@v5.5.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@v5.4.0 + uses: docker/bake-action@v5.5.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index eccda650..c2d3b321 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@v5.4.0 + uses: docker/bake-action@v5.5.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.4.0 + uses: docker/bake-action@v5.5.0 with: push: true From c5b3f50b02cce4be2aae33254cf51495029f1d51 Mon Sep 17 00:00:00 2001 From: Sai Vineeth <64919520+saivineeth100@users.noreply.github.com> Date: Wed, 24 Jul 2024 09:13:06 +0530 Subject: [PATCH 114/193] Updated example.env to include correct reference to doc (#1443) --- example.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.env b/example.env index 694eb7ac..b6b489d8 100644 --- a/example.env +++ b/example.env @@ -1,4 +1,4 @@ -# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md +# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md ERPNEXT_VERSION=v15.30.0 From f46582fc466433682942fdc91d3ca8fe53ac78da Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 Jul 2024 07:35:38 +0000 Subject: [PATCH 115/193] 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 b6b489d8..4c39683a 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.30.0 +ERPNEXT_VERSION=v15.31.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index fc98798a..b748939b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.30.0 + image: frappe/erpnext:v15.31.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.30.0 + image: frappe/erpnext:v15.31.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.30.0 + image: frappe/erpnext:v15.31.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.30.0 + image: frappe/erpnext:v15.31.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.30.0 + image: frappe/erpnext:v15.31.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.30.0 + image: frappe/erpnext:v15.31.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.30.0 + image: frappe/erpnext:v15.31.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.30.0 + image: frappe/erpnext:v15.31.0 deploy: restart_policy: condition: on-failure From e70b9954c6115f4dd55e7e43ca4e1906da130147 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 Jul 2024 14:09:33 +0000 Subject: [PATCH 116/193] 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 4c39683a..42d6d9fd 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.31.0 +ERPNEXT_VERSION=v15.31.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index b748939b..a9aec413 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.31.0 + image: frappe/erpnext:v15.31.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.31.0 + image: frappe/erpnext:v15.31.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.31.0 + image: frappe/erpnext:v15.31.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.31.0 + image: frappe/erpnext:v15.31.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.31.0 + image: frappe/erpnext:v15.31.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.31.0 + image: frappe/erpnext:v15.31.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.31.0 + image: frappe/erpnext:v15.31.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.31.0 + image: frappe/erpnext:v15.31.1 deploy: restart_policy: condition: on-failure From 36e6650045697318cb63fcdaf9a77de4429fca74 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 27 Jul 2024 05:46:54 +0000 Subject: [PATCH 117/193] 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 42d6d9fd..665d006e 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.31.1 +ERPNEXT_VERSION=v15.31.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a9aec413..e80baca6 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.31.1 + image: frappe/erpnext:v15.31.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.31.1 + image: frappe/erpnext:v15.31.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.31.1 + image: frappe/erpnext:v15.31.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.31.1 + image: frappe/erpnext:v15.31.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.31.1 + image: frappe/erpnext:v15.31.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.31.1 + image: frappe/erpnext:v15.31.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.31.1 + image: frappe/erpnext:v15.31.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.31.1 + image: frappe/erpnext:v15.31.2 deploy: restart_policy: condition: on-failure From 6ae6591048245640e3da2f0089fe461c85a79fd7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 31 Jul 2024 06:09:52 +0000 Subject: [PATCH 118/193] 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 665d006e..1535a036 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.31.2 +ERPNEXT_VERSION=v15.31.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e80baca6..2b2a7eed 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.31.2 + image: frappe/erpnext:v15.31.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.31.2 + image: frappe/erpnext:v15.31.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.31.2 + image: frappe/erpnext:v15.31.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.31.2 + image: frappe/erpnext:v15.31.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.31.2 + image: frappe/erpnext:v15.31.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.31.2 + image: frappe/erpnext:v15.31.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.31.2 + image: frappe/erpnext:v15.31.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.31.2 + image: frappe/erpnext:v15.31.3 deploy: restart_policy: condition: on-failure From aeaaee09b6451e8a698af73f1120b71f91d86f67 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 3 Aug 2024 04:07:19 +0000 Subject: [PATCH 119/193] 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 1535a036..2ad02440 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.31.3 +ERPNEXT_VERSION=v15.31.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2b2a7eed..ec630bf4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.31.3 + image: frappe/erpnext:v15.31.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.31.3 + image: frappe/erpnext:v15.31.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.31.3 + image: frappe/erpnext:v15.31.5 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.31.3 + image: frappe/erpnext:v15.31.5 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.31.3 + image: frappe/erpnext:v15.31.5 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.31.3 + image: frappe/erpnext:v15.31.5 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.31.3 + image: frappe/erpnext:v15.31.5 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.31.3 + image: frappe/erpnext:v15.31.5 deploy: restart_policy: condition: on-failure From b09fc2ee95654c5efd098d0783fd4129c8e7fd01 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 7 Aug 2024 09:36:22 +0000 Subject: [PATCH 120/193] 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 2ad02440..62530f73 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.31.5 +ERPNEXT_VERSION=v15.32.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index ec630bf4..bf18ec9f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.31.5 + image: frappe/erpnext:v15.32.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.31.5 + image: frappe/erpnext:v15.32.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.31.5 + image: frappe/erpnext:v15.32.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.31.5 + image: frappe/erpnext:v15.32.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.31.5 + image: frappe/erpnext:v15.32.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.31.5 + image: frappe/erpnext:v15.32.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.31.5 + image: frappe/erpnext:v15.32.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.31.5 + image: frappe/erpnext:v15.32.0 deploy: restart_policy: condition: on-failure From 624fc2ea83ce96d7e7cd3f352f45494d39b7a263 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 8 Aug 2024 07:22:51 +0000 Subject: [PATCH 121/193] 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 62530f73..545cca6a 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.32.0 +ERPNEXT_VERSION=v15.32.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index bf18ec9f..e4320973 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.32.0 + image: frappe/erpnext:v15.32.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.32.0 + image: frappe/erpnext:v15.32.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.32.0 + image: frappe/erpnext:v15.32.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.32.0 + image: frappe/erpnext:v15.32.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.32.0 + image: frappe/erpnext:v15.32.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.32.0 + image: frappe/erpnext:v15.32.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.32.0 + image: frappe/erpnext:v15.32.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.32.0 + image: frappe/erpnext:v15.32.1 deploy: restart_policy: condition: on-failure From 4f91e895031de35fffc37eaab2ead3c4a8499444 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:44:48 +0530 Subject: [PATCH 122/193] chore(deps): bump pytest from 8.3.1 to 8.3.2 (#1447) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.1 to 8.3.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/8.3.1...8.3.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 befd7183..fe93bd52 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.3.1 +pytest==8.3.2 From 61ff94de86f756e3fa756095c1168ce6755c8c72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:45:22 +0530 Subject: [PATCH 123/193] chore(deps): Update pre-commit hooks (#1448) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 61387bbe..c5629516 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,13 +8,13 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.16.0 + rev: v3.17.0 hooks: - id: pyupgrade args: [--py37-plus] - repo: https://github.com/psf/black - rev: 24.4.2 + rev: 24.8.0 hooks: - id: black From 79004d15bc6573f676e289ccfea86da93788000c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:45:45 +0530 Subject: [PATCH 124/193] chore(deps): bump docker/bake-action from 5.5.0 to 5.6.1 (#1453) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.5.0 to 5.6.1. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.5.0...v5.6.1) --- 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 7a99cd80..4f3ab94f 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@v5.5.0 + uses: docker/bake-action@v5.6.1 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@v5.5.0 + uses: docker/bake-action@v5.6.1 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index c2d3b321..178600b5 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@v5.5.0 + uses: docker/bake-action@v5.6.1 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.5.0 + uses: docker/bake-action@v5.6.1 with: push: true From a7dd0f9d080e4c24bf7b459871d3df1e59fdddba Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Aug 2024 08:09:40 +0000 Subject: [PATCH 125/193] 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 545cca6a..05faf3f2 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.32.1 +ERPNEXT_VERSION=v15.33.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e4320973..73e06534 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.32.1 + image: frappe/erpnext:v15.33.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.32.1 + image: frappe/erpnext:v15.33.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.32.1 + image: frappe/erpnext:v15.33.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.32.1 + image: frappe/erpnext:v15.33.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.32.1 + image: frappe/erpnext:v15.33.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.32.1 + image: frappe/erpnext:v15.33.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.32.1 + image: frappe/erpnext:v15.33.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.32.1 + image: frappe/erpnext:v15.33.0 deploy: restart_policy: condition: on-failure From 9c9e1c4f1e36482778e252f07ab17920de3e480b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Aug 2024 06:27:25 +0000 Subject: [PATCH 126/193] 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 05faf3f2..c514869e 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.33.0 +ERPNEXT_VERSION=v15.33.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 73e06534..a31ee4d2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.33.0 + image: frappe/erpnext:v15.33.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.33.0 + image: frappe/erpnext:v15.33.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.33.0 + image: frappe/erpnext:v15.33.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.33.0 + image: frappe/erpnext:v15.33.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.33.0 + image: frappe/erpnext:v15.33.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.33.0 + image: frappe/erpnext:v15.33.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.33.0 + image: frappe/erpnext:v15.33.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.33.0 + image: frappe/erpnext:v15.33.1 deploy: restart_policy: condition: on-failure From 1bffb148539c74ff8a5e6d69eb0adfd759523351 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Aug 2024 11:18:14 +0000 Subject: [PATCH 127/193] 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 c514869e..f9e4e674 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.33.1 +ERPNEXT_VERSION=v15.33.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a31ee4d2..9d923e22 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.33.1 + image: frappe/erpnext:v15.33.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.33.1 + image: frappe/erpnext:v15.33.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.33.1 + image: frappe/erpnext:v15.33.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.33.1 + image: frappe/erpnext:v15.33.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.33.1 + image: frappe/erpnext:v15.33.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.33.1 + image: frappe/erpnext:v15.33.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.33.1 + image: frappe/erpnext:v15.33.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.33.1 + image: frappe/erpnext:v15.33.2 deploy: restart_policy: condition: on-failure From 30cc91bfd47bff1f6c634a68d16f27c980eb6acf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:59:36 +0530 Subject: [PATCH 128/193] chore(deps): bump docker/bake-action from 5.6.1 to 5.7.0 (#1457) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.6.1 to 5.7.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.6.1...v5.7.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 4f3ab94f..38a44733 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@v5.6.1 + uses: docker/bake-action@v5.7.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@v5.6.1 + uses: docker/bake-action@v5.7.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 178600b5..72dee2bf 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@v5.6.1 + uses: docker/bake-action@v5.7.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.6.1 + uses: docker/bake-action@v5.7.0 with: push: true From 2deb97b7b5ec2cfc6284aacf1a5c7140e27f34ea Mon Sep 17 00:00:00 2001 From: Sagar <74648730+SagarIdeen@users.noreply.github.com> Date: Mon, 19 Aug 2024 12:50:46 +0530 Subject: [PATCH 129/193] Update example.env (#1445) Added HTTP_PUBLISH_PORT variable for updating the published port. Default value will be 8080. if we want to update the port we can specify here. --- example.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/example.env b/example.env index f9e4e674..3ff0aaf7 100644 --- a/example.env +++ b/example.env @@ -23,6 +23,9 @@ LETSENCRYPT_EMAIL=mail@example.com # and do want to access it by `127.0.0.1` host. Than you would set this variable to `mysite`. FRAPPE_SITE_NAME_HEADER= +# Default value is `8080`. +HTTP_PUBLISH_PORT= + # Default value is `127.0.0.1`. Set IP address as our trusted upstream address. UPSTREAM_REAL_IP_ADDRESS= From 8a27a249c360990860b39b1b81de7186f358dd87 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 21 Aug 2024 05:29:42 +0000 Subject: [PATCH 130/193] 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 3ff0aaf7..f29b1a4d 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.33.2 +ERPNEXT_VERSION=v15.33.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 9d923e22..876d0039 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.33.2 + image: frappe/erpnext:v15.33.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.33.2 + image: frappe/erpnext:v15.33.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.33.2 + image: frappe/erpnext:v15.33.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.33.2 + image: frappe/erpnext:v15.33.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.33.2 + image: frappe/erpnext:v15.33.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.33.2 + image: frappe/erpnext:v15.33.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.33.2 + image: frappe/erpnext:v15.33.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.33.2 + image: frappe/erpnext:v15.33.3 deploy: restart_policy: condition: on-failure From b9ece352874d39cbb6077d5c6844aaa925f02c41 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 21 Aug 2024 11:17:05 +0000 Subject: [PATCH 131/193] 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 f29b1a4d..605d0402 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.33.3 +ERPNEXT_VERSION=v15.33.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 876d0039..52a13203 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.33.3 + image: frappe/erpnext:v15.33.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.33.3 + image: frappe/erpnext:v15.33.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.33.3 + image: frappe/erpnext:v15.33.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.33.3 + image: frappe/erpnext:v15.33.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.33.3 + image: frappe/erpnext:v15.33.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.33.3 + image: frappe/erpnext:v15.33.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.33.3 + image: frappe/erpnext:v15.33.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.33.3 + image: frappe/erpnext:v15.33.4 deploy: restart_policy: condition: on-failure From 7c4543d7ead71e2e3b1f3b485a55ce73e377bcee Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 23 Aug 2024 00:46:19 +0000 Subject: [PATCH 132/193] 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 605d0402..bfd1d351 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.33.4 +ERPNEXT_VERSION=v15.33.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 52a13203..873f5e61 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.33.4 + image: frappe/erpnext:v15.33.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.33.4 + image: frappe/erpnext:v15.33.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.33.4 + image: frappe/erpnext:v15.33.5 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.33.4 + image: frappe/erpnext:v15.33.5 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.33.4 + image: frappe/erpnext:v15.33.5 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.33.4 + image: frappe/erpnext:v15.33.5 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.33.4 + image: frappe/erpnext:v15.33.5 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.33.4 + image: frappe/erpnext:v15.33.5 deploy: restart_policy: condition: on-failure From 8c34e94dbb896bfb7058837228f67eb36ea1d2b9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Sep 2024 15:08:07 +0000 Subject: [PATCH 133/193] 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 bfd1d351..8946c687 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.33.5 +ERPNEXT_VERSION=v15.34.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 873f5e61..799d7ebc 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.33.5 + image: frappe/erpnext:v15.34.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.33.5 + image: frappe/erpnext:v15.34.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.33.5 + image: frappe/erpnext:v15.34.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.33.5 + image: frappe/erpnext:v15.34.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.33.5 + image: frappe/erpnext:v15.34.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.33.5 + image: frappe/erpnext:v15.34.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.33.5 + image: frappe/erpnext:v15.34.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.33.5 + image: frappe/erpnext:v15.34.0 deploy: restart_policy: condition: on-failure From 38a2ebf5741c2aecf912409e962371617ef3b2c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:51:39 +0530 Subject: [PATCH 134/193] chore(deps): bump peter-evans/create-pull-request from 6 to 7 (#1461) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v7) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request 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/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 1fdeaeea..5612c735 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -16,7 +16,7 @@ jobs: uses: vrslev/pre-commit-autoupdate@v1.0.0 - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: branch: pre-commit-autoupdate title: "chore(deps): Update pre-commit hooks" From 7fb2ff94a6e81bea3a97fe208b6161197618681a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 5 Sep 2024 11:58:42 +0000 Subject: [PATCH 135/193] 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 8946c687..53aa699c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.34.0 +ERPNEXT_VERSION=v15.34.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 799d7ebc..7e1cc9b0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.34.0 + image: frappe/erpnext:v15.34.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.34.0 + image: frappe/erpnext:v15.34.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.34.0 + image: frappe/erpnext:v15.34.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.34.0 + image: frappe/erpnext:v15.34.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.34.0 + image: frappe/erpnext:v15.34.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.34.0 + image: frappe/erpnext:v15.34.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.34.0 + image: frappe/erpnext:v15.34.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.34.0 + image: frappe/erpnext:v15.34.1 deploy: restart_policy: condition: on-failure From 5064ece68cef9e8d61cf3007ac4a4131eebd210c Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 7 Sep 2024 12:48:51 +0000 Subject: [PATCH 136/193] 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 53aa699c..ea09a6ae 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.34.1 +ERPNEXT_VERSION=v15.34.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7e1cc9b0..1584cee0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.34.1 + image: frappe/erpnext:v15.34.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.34.1 + image: frappe/erpnext:v15.34.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.34.1 + image: frappe/erpnext:v15.34.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.34.1 + image: frappe/erpnext:v15.34.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.34.1 + image: frappe/erpnext:v15.34.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.34.1 + image: frappe/erpnext:v15.34.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.34.1 + image: frappe/erpnext:v15.34.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.34.1 + image: frappe/erpnext:v15.34.2 deploy: restart_policy: condition: on-failure From fbb13c2b0a3906606d02d0fff6e2e1a920c056b7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Sep 2024 05:20:16 +0000 Subject: [PATCH 137/193] 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 ea09a6ae..26c51a52 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.34.2 +ERPNEXT_VERSION=v15.35.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1584cee0..4e98151e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.34.2 + image: frappe/erpnext:v15.35.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.34.2 + image: frappe/erpnext:v15.35.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.34.2 + image: frappe/erpnext:v15.35.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.34.2 + image: frappe/erpnext:v15.35.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.34.2 + image: frappe/erpnext:v15.35.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.34.2 + image: frappe/erpnext:v15.35.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.34.2 + image: frappe/erpnext:v15.35.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.34.2 + image: frappe/erpnext:v15.35.0 deploy: restart_policy: condition: on-failure From 893f0ebd1dd0092670afbf3d901bced2d7071bfd Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 12 Sep 2024 06:19:49 +0000 Subject: [PATCH 138/193] 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 26c51a52..37bf429c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.35.0 +ERPNEXT_VERSION=v15.35.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 4e98151e..5b9a6821 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.35.0 + image: frappe/erpnext:v15.35.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.35.0 + image: frappe/erpnext:v15.35.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.35.0 + image: frappe/erpnext:v15.35.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.35.0 + image: frappe/erpnext:v15.35.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.35.0 + image: frappe/erpnext:v15.35.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.35.0 + image: frappe/erpnext:v15.35.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.35.0 + image: frappe/erpnext:v15.35.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.35.0 + image: frappe/erpnext:v15.35.1 deploy: restart_policy: condition: on-failure From 5ec965e71bd4bd48cd728776d5f428ff81887a6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2024 03:10:02 +0530 Subject: [PATCH 139/193] chore(deps): bump pytest from 8.3.2 to 8.3.3 (#1466) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.2 to 8.3.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/8.3.2...8.3.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 fe93bd52..40543aab 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.3.2 +pytest==8.3.3 From 509f88846f191850e804fc371a0f89ba11e45f36 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 17 Sep 2024 05:08:50 +0000 Subject: [PATCH 140/193] 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 37bf429c..51e02a1e 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.35.1 +ERPNEXT_VERSION=v15.35.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 5b9a6821..0a8f1dcf 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.35.1 + image: frappe/erpnext:v15.35.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.35.1 + image: frappe/erpnext:v15.35.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.35.1 + image: frappe/erpnext:v15.35.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.35.1 + image: frappe/erpnext:v15.35.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.35.1 + image: frappe/erpnext:v15.35.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.35.1 + image: frappe/erpnext:v15.35.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.35.1 + image: frappe/erpnext:v15.35.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.35.1 + image: frappe/erpnext:v15.35.2 deploy: restart_policy: condition: on-failure From b16bad397529ebe17b6bc584997e0c5ea4b16cbb Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 18 Sep 2024 07:41:09 +0000 Subject: [PATCH 141/193] 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 51e02a1e..28491e1b 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.35.2 +ERPNEXT_VERSION=v15.36.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0a8f1dcf..5fee151a 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.35.2 + image: frappe/erpnext:v15.36.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.35.2 + image: frappe/erpnext:v15.36.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.35.2 + image: frappe/erpnext:v15.36.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.35.2 + image: frappe/erpnext:v15.36.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.35.2 + image: frappe/erpnext:v15.36.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.35.2 + image: frappe/erpnext:v15.36.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.35.2 + image: frappe/erpnext:v15.36.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.35.2 + image: frappe/erpnext:v15.36.0 deploy: restart_policy: condition: on-failure From 083a62374e7c385f2351466992a0f7fd152a2093 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 19 Sep 2024 01:51:55 +0000 Subject: [PATCH 142/193] 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 28491e1b..c146d97c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.36.0 +ERPNEXT_VERSION=v15.36.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 5fee151a..2b4db8d2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.0 + image: frappe/erpnext:v15.36.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.0 + image: frappe/erpnext:v15.36.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.0 + image: frappe/erpnext:v15.36.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.0 + image: frappe/erpnext:v15.36.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.0 + image: frappe/erpnext:v15.36.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.0 + image: frappe/erpnext:v15.36.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.0 + image: frappe/erpnext:v15.36.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.0 + image: frappe/erpnext:v15.36.1 deploy: restart_policy: condition: on-failure From dd18f558a4bb9bf8094bf836dfcb4c7dd0c17bce Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 25 Sep 2024 04:47:36 +0000 Subject: [PATCH 143/193] 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 c146d97c..37806633 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.36.1 +ERPNEXT_VERSION=v15.36.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2b4db8d2..f4eed91d 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure From 5f815d88a965dc11910e6fb88e3a6b00e1cf00e0 Mon Sep 17 00:00:00 2001 From: gp <370905+gparent@users.noreply.github.com> Date: Thu, 26 Sep 2024 03:20:18 -0400 Subject: [PATCH 144/193] Update Traefik container from deprecated v2.6 to v2.11 (#1475) --- overrides/compose.https.yaml | 2 +- overrides/compose.proxy.yaml | 2 +- overrides/compose.traefik.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/overrides/compose.https.yaml b/overrides/compose.https.yaml index aa17a68e..8d78602a 100644 --- a/overrides/compose.https.yaml +++ b/overrides/compose.https.yaml @@ -8,7 +8,7 @@ services: - traefik.http.routers.frontend-http.rule=Host(${SITES:?List of sites not set}) proxy: - image: traefik:2.5 + image: traefik:v2.11 command: - --providers.docker=true - --providers.docker.exposedbydefault=false diff --git a/overrides/compose.proxy.yaml b/overrides/compose.proxy.yaml index c887ffa5..32ce9fab 100644 --- a/overrides/compose.proxy.yaml +++ b/overrides/compose.proxy.yaml @@ -7,7 +7,7 @@ services: - traefik.http.routers.frontend-http.rule=HostRegexp(`{any:.+}`) proxy: - image: traefik:2.5 + image: traefik:v2.11 command: - --providers.docker - --providers.docker.exposedbydefault=false diff --git a/overrides/compose.traefik.yaml b/overrides/compose.traefik.yaml index 1e4432ff..25d362af 100644 --- a/overrides/compose.traefik.yaml +++ b/overrides/compose.traefik.yaml @@ -2,7 +2,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.6" + image: "traefik:v2.11" restart: unless-stopped labels: # Enable Traefik for this service, to make it available in the public network From 45259b4ebb6b25927ca71494c34e5c992841e4e2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 27 Sep 2024 18:40:16 +0000 Subject: [PATCH 145/193] 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 37806633..54f6dcf7 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.36.2 +ERPNEXT_VERSION=v15.36.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f4eed91d..f40117d0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure From d062ef035b061015abcfab1c9cc761b2194c389c Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 29 Sep 2024 16:46:58 +0000 Subject: [PATCH 146/193] 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 54f6dcf7..bbea07eb 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.36.3 +ERPNEXT_VERSION=v15.36.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f40117d0..85c75cf6 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure From 111c8deb4a0ea909f3a4ec203e0b898d2f176aa0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 30 Sep 2024 17:29:56 +0000 Subject: [PATCH 147/193] 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 bbea07eb..104b01fb 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.36.4 +ERPNEXT_VERSION=v15.37.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 85c75cf6..c4c1cc18 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure From f4fd057d0fcabd9bb375cf76012cb9b9210731ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 06:49:58 +0530 Subject: [PATCH 148/193] chore(deps): bump docker/bake-action from 5.7.0 to 5.8.0 (#1477) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.7.0 to 5.8.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.7.0...v5.8.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 38a44733..94636143 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@v5.7.0 + uses: docker/bake-action@v5.8.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@v5.7.0 + uses: docker/bake-action@v5.8.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 72dee2bf..fe30fbea 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@v5.7.0 + uses: docker/bake-action@v5.8.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.7.0 + uses: docker/bake-action@v5.8.0 with: push: true From 41dd3fb110ab86193e75909c05766171cb53e0f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:37:34 +0530 Subject: [PATCH 149/193] chore(deps): bump docker/bake-action from 5.8.0 to 5.9.0 (#1478) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.8.0 to 5.9.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.8.0...v5.9.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 94636143..acbe065a 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@v5.8.0 + uses: docker/bake-action@v5.9.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@v5.8.0 + uses: docker/bake-action@v5.9.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index fe30fbea..4dce5a1e 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@v5.8.0 + uses: docker/bake-action@v5.9.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.8.0 + uses: docker/bake-action@v5.9.0 with: push: true From c5b6c7de6ff2a82c2ffe722916a60d856082f893 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 4 Oct 2024 03:13:06 +0000 Subject: [PATCH 150/193] 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 104b01fb..b352caba 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.37.0 +ERPNEXT_VERSION=v15.38.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c4c1cc18..acc07222 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.37.0 + image: frappe/erpnext:v15.38.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.37.0 + image: frappe/erpnext:v15.38.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.37.0 + image: frappe/erpnext:v15.38.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.37.0 + image: frappe/erpnext:v15.38.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.37.0 + image: frappe/erpnext:v15.38.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.37.0 + image: frappe/erpnext:v15.38.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.37.0 + image: frappe/erpnext:v15.38.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.37.0 + image: frappe/erpnext:v15.38.0 deploy: restart_policy: condition: on-failure From 6abc293ed9552f8ba2896422ffef333b852269c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 18:47:24 +0530 Subject: [PATCH 151/193] chore(deps): bump docker/bake-action from 5.9.0 to 5.10.0 (#1480) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.9.0 to 5.10.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.9.0...v5.10.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 acbe065a..6b4afeaf 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@v5.9.0 + uses: docker/bake-action@v5.10.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@v5.9.0 + uses: docker/bake-action@v5.10.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 4dce5a1e..e5e9fda9 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@v5.9.0 + uses: docker/bake-action@v5.10.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.9.0 + uses: docker/bake-action@v5.10.0 with: push: true From 457f55e49232596166fdec7bc47a474604d0b5e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2024 13:20:18 +0530 Subject: [PATCH 152/193] chore(deps): Update pre-commit hooks (#1486) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 c5629516..e41c56d9 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.6.0 + rev: v5.0.0 hooks: - id: check-executables-have-shebangs - id: check-shebang-scripts-are-executable From eb3ce8a14698bb7826542d6d9b30342ac8b7da92 Mon Sep 17 00:00:00 2001 From: Martin Heini Date: Sun, 6 Oct 2024 10:17:47 +0200 Subject: [PATCH 153/193] increase mariadb health-check timeout (#1485) --- docs/setup_for_linux_mac.md | 2 +- overrides/compose.mariadb-shared.yaml | 2 +- overrides/compose.mariadb.yaml | 2 +- pwd.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index 8e1fb906..b26cef48 100644 --- a/docs/setup_for_linux_mac.md +++ b/docs/setup_for_linux_mac.md @@ -91,7 +91,7 @@ services: healthcheck: test: mysqladmin ping -h localhost --password=admin interval: 1s - retries: 15 + retries: 20 deploy: restart_policy: condition: on-failure diff --git a/overrides/compose.mariadb-shared.yaml b/overrides/compose.mariadb-shared.yaml index 13bfc656..8872b48f 100644 --- a/overrides/compose.mariadb-shared.yaml +++ b/overrides/compose.mariadb-shared.yaml @@ -8,7 +8,7 @@ services: healthcheck: test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-changeit} interval: 1s - retries: 15 + retries: 20 command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci diff --git a/overrides/compose.mariadb.yaml b/overrides/compose.mariadb.yaml index cd719b62..3dee180f 100644 --- a/overrides/compose.mariadb.yaml +++ b/overrides/compose.mariadb.yaml @@ -12,7 +12,7 @@ services: healthcheck: test: mysqladmin ping -h localhost --password=${DB_PASSWORD} interval: 1s - retries: 15 + retries: 20 command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci diff --git a/pwd.yml b/pwd.yml index acc07222..386b9a47 100644 --- a/pwd.yml +++ b/pwd.yml @@ -74,7 +74,7 @@ services: healthcheck: test: mysqladmin ping -h localhost --password=admin interval: 1s - retries: 15 + retries: 20 deploy: restart_policy: condition: on-failure From 10c755fe0cb4167954ee45af6cd8c4d4764339f2 Mon Sep 17 00:00:00 2001 From: Edward Almanzar Date: Sun, 6 Oct 2024 08:19:47 -0400 Subject: [PATCH 154/193] Enhance Docs for Custom Apps: Base64 Decoding for Testing and Fix 'nginx-entrypoint.sh: No Such File' Issue on Windows only" (#1479) * Decode the Base64-encoded Environment Variable * add docs to fix nginx-entrypoint.sh: no such file on windows * Revert "add docs to fix nginx-entrypoint.sh: no such file on windows" This reverts commit 395d7cfa3f724073adb702d43195eb5452d89e06. * add docs to fix nginx-entrypoint.sh: no such file on windows * Fix files according to pre-commit hooks --- docs/custom-apps.md | 12 ++++++++++++ docs/error-nginx-entrypoint-windows.md | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 docs/error-nginx-entrypoint-windows.md diff --git a/docs/custom-apps.md b/docs/custom-apps.md index f33aa3c7..a3d4ef6c 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -34,6 +34,18 @@ You can also generate base64 string from json file: export APPS_JSON_BASE64=$(base64 -w 0 /path/to/apps.json) ``` +Test the Previous Step: Decode the Base64-encoded Environment Variable + +To verify the previous step, decode the APPS_JSON_BASE64 environment variable (which is Base64-encoded) into a JSON file. Follow the steps below: + +1. Use the following command to decode and save the output into a JSON file named apps-test-output.json: + +```shell +echo -n ${APPS_JSON_BASE64} | base64 -d > apps-test-output.json +``` + +2. Open the apps-test-output.json file to review the JSON output and ensure that the content is correct. + Note: - `url` needs to be http(s) git url with personal access tokens without username eg:- http://{{PAT}}@github.com/project/repository.git in case of private repo. diff --git a/docs/error-nginx-entrypoint-windows.md b/docs/error-nginx-entrypoint-windows.md new file mode 100644 index 00000000..7be1c2ca --- /dev/null +++ b/docs/error-nginx-entrypoint-windows.md @@ -0,0 +1,12 @@ +# Resolving Docker `nginx-entrypoint.sh` Script Not Found Error on Windows + +If you're encountering the error `exec /usr/local/bin/nginx-entrypoint.sh: no such file or directory` in a Docker container on Windows, follow these steps to resolve the issue. + +## 1. Check Line Endings + +On Windows, files often have `CRLF` line endings, while Linux systems expect `LF`. This can cause issues when executing shell scripts in Linux containers. + +- **Convert Line Endings using `dos2unix`:** + ```bash + dos2unix resources/nginx-entrypoint.sh + ``` From ca573084d60b41851e14d24b2b8fe0556171f3f2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Oct 2024 12:12:03 +0000 Subject: [PATCH 155/193] 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 b352caba..f11420ab 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.38.0 +ERPNEXT_VERSION=v15.38.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 386b9a47..ef64f441 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.38.0 + image: frappe/erpnext:v15.38.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.38.0 + image: frappe/erpnext:v15.38.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.38.0 + image: frappe/erpnext:v15.38.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.38.0 + image: frappe/erpnext:v15.38.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.38.0 + image: frappe/erpnext:v15.38.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.38.0 + image: frappe/erpnext:v15.38.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.38.0 + image: frappe/erpnext:v15.38.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.38.0 + image: frappe/erpnext:v15.38.1 deploy: restart_policy: condition: on-failure From 08e714e329fe8532dafe38d1ce7cf2d015a8cb9f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 07:10:17 +0530 Subject: [PATCH 156/193] chore(deps): Update pre-commit hooks (#1488) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 e41c56d9..1400300d 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: 24.8.0 + rev: 24.10.0 hooks: - id: black From 17f8e4930139981299323341f78ee5e8270bd212 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 13 Oct 2024 05:32:28 +0000 Subject: [PATCH 157/193] 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 f11420ab..9e1ee957 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.38.1 +ERPNEXT_VERSION=v15.38.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index ef64f441..c11428b0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.38.1 + image: frappe/erpnext:v15.38.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.38.1 + image: frappe/erpnext:v15.38.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.38.1 + image: frappe/erpnext:v15.38.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.38.1 + image: frappe/erpnext:v15.38.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.38.1 + image: frappe/erpnext:v15.38.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.38.1 + image: frappe/erpnext:v15.38.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.38.1 + image: frappe/erpnext:v15.38.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.38.1 + image: frappe/erpnext:v15.38.2 deploy: restart_policy: condition: on-failure From f0796785d164af87d71c7a6b30e8302a405e6af8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:37:16 +0530 Subject: [PATCH 158/193] chore(deps): Update pre-commit hooks (#1490) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 1400300d..4abf4ab1 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.17.0 + rev: v3.18.0 hooks: - id: pyupgrade args: [--py37-plus] From 727ce423ec9eb5698e7a607f41c207dd1c74faf9 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 15 Oct 2024 11:38:00 +0530 Subject: [PATCH 159/193] chore: add link to FAQ in production container (#1493) * chore: add link to FAQ in production container prompt * chore: add message link to FAQ in production container * docs: add link to FAQ in README --- README.md | 2 ++ images/production/Containerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index c341160e..5eece84d 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ If you ran in a Dev Docker environment, to view container logs: `docker compose # Documentation +### [Frequently Asked Questions](https://github.com/frappe/frappe_docker/wiki/Frequently-Asked-Questions) + ### [Production](#production) - [List of containers](docs/list-of-containers.md) diff --git a/images/production/Containerfile b/images/production/Containerfile index dc13262d..fddfdeaf 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -119,6 +119,8 @@ FROM base AS erpnext USER frappe +RUN echo "echo \"Commands restricted in prodution container, Read FAQ before you proceed: https://frappe.fyi/ctr-faq\"" >> ~/.bashrc + COPY --from=builder --chown=frappe:frappe /home/frappe/frappe-bench /home/frappe/frappe-bench WORKDIR /home/frappe/frappe-bench From e7fff1db9a9b2868bf06e6a3999ea5b4a946c6fe Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Oct 2024 05:11:03 +0000 Subject: [PATCH 160/193] 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 9e1ee957..9ad66fab 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.38.2 +ERPNEXT_VERSION=v15.38.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c11428b0..1a46d6e0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.38.2 + image: frappe/erpnext:v15.38.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.38.2 + image: frappe/erpnext:v15.38.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.38.2 + image: frappe/erpnext:v15.38.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.38.2 + image: frappe/erpnext:v15.38.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.38.2 + image: frappe/erpnext:v15.38.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.38.2 + image: frappe/erpnext:v15.38.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.38.2 + image: frappe/erpnext:v15.38.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.38.2 + image: frappe/erpnext:v15.38.3 deploy: restart_policy: condition: on-failure From 19b3012242b5be970a64339c5abc39d2783c16fd Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 17 Oct 2024 16:25:38 +0000 Subject: [PATCH 161/193] 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 9ad66fab..2d8fc7d7 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.38.3 +ERPNEXT_VERSION=v15.38.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1a46d6e0..48c668bb 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.38.3 + image: frappe/erpnext:v15.38.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.38.3 + image: frappe/erpnext:v15.38.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.38.3 + image: frappe/erpnext:v15.38.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.38.3 + image: frappe/erpnext:v15.38.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.38.3 + image: frappe/erpnext:v15.38.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.38.3 + image: frappe/erpnext:v15.38.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.38.3 + image: frappe/erpnext:v15.38.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.38.3 + image: frappe/erpnext:v15.38.4 deploy: restart_policy: condition: on-failure From 6bed906751a6360ae393aa3346756aedc40059a8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Oct 2024 04:54:37 +0000 Subject: [PATCH 162/193] 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 2d8fc7d7..7e58b93e 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.38.4 +ERPNEXT_VERSION=v15.39.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 48c668bb..7bb07591 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.38.4 + image: frappe/erpnext:v15.39.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.38.4 + image: frappe/erpnext:v15.39.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.38.4 + image: frappe/erpnext:v15.39.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.38.4 + image: frappe/erpnext:v15.39.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.38.4 + image: frappe/erpnext:v15.39.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.38.4 + image: frappe/erpnext:v15.39.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.38.4 + image: frappe/erpnext:v15.39.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.38.4 + image: frappe/erpnext:v15.39.0 deploy: restart_policy: condition: on-failure From f2924998e8e2667cc525bbfd046c9524eb0b0fbf Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Oct 2024 09:17:02 +0000 Subject: [PATCH 163/193] 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 7e58b93e..422a5eab 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.39.0 +ERPNEXT_VERSION=v15.39.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7bb07591..53a7f2fc 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.39.0 + image: frappe/erpnext:v15.39.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.39.0 + image: frappe/erpnext:v15.39.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.39.0 + image: frappe/erpnext:v15.39.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.39.0 + image: frappe/erpnext:v15.39.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.39.0 + image: frappe/erpnext:v15.39.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.39.0 + image: frappe/erpnext:v15.39.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.39.0 + image: frappe/erpnext:v15.39.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.39.0 + image: frappe/erpnext:v15.39.1 deploy: restart_policy: condition: on-failure From de28675f8f3048d55af9a48c2a962abdcfb33920 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:11:50 +0530 Subject: [PATCH 164/193] chore(deps): Update pre-commit hooks (#1495) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 4abf4ab1..a4b37b29 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.18.0 + rev: v3.19.0 hooks: - id: pyupgrade args: [--py37-plus] From 36704ece7005393cf9f23f9d053bbc88021b4d16 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Oct 2024 12:21:29 +0000 Subject: [PATCH 165/193] 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 422a5eab..89f8c01f 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.39.1 +ERPNEXT_VERSION=v15.39.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 53a7f2fc..f606d86f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.39.1 + image: frappe/erpnext:v15.39.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.39.1 + image: frappe/erpnext:v15.39.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.39.1 + image: frappe/erpnext:v15.39.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.39.1 + image: frappe/erpnext:v15.39.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.39.1 + image: frappe/erpnext:v15.39.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.39.1 + image: frappe/erpnext:v15.39.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.39.1 + image: frappe/erpnext:v15.39.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.39.1 + image: frappe/erpnext:v15.39.2 deploy: restart_policy: condition: on-failure From fe880183f9a51dc0fbb22de1285398d986660d5c Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 24 Oct 2024 08:31:19 +0000 Subject: [PATCH 166/193] 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 89f8c01f..dd0249ca 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.39.2 +ERPNEXT_VERSION=v15.39.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f606d86f..f4a1ef31 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.39.2 + image: frappe/erpnext:v15.39.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.39.2 + image: frappe/erpnext:v15.39.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.39.2 + image: frappe/erpnext:v15.39.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.39.2 + image: frappe/erpnext:v15.39.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.39.2 + image: frappe/erpnext:v15.39.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.39.2 + image: frappe/erpnext:v15.39.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.39.2 + image: frappe/erpnext:v15.39.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.39.2 + image: frappe/erpnext:v15.39.3 deploy: restart_policy: condition: on-failure From 8ac69bb5012ce6c278cff86682cc233597052853 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 25 Oct 2024 14:08:24 +0530 Subject: [PATCH 167/193] feat: allow layered custom image build (#1497) speed up build time pull builder image pack built assets into base image --- docker-bake.hcl | 16 +++++++++++ images/layered/Containerfile | 47 +++++++++++++++++++++++++++++++++ images/production/Containerfile | 4 ++- 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 images/layered/Containerfile diff --git a/docker-bake.hcl b/docker-bake.hcl index f2a9fc70..db6d9ac0 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -91,3 +91,19 @@ target "erpnext" { target = "erpnext" tags = tag("erpnext", "${ERPNEXT_VERSION}") } + +target "base" { + inherits = ["default-args"] + context = "." + dockerfile = "images/production/Containerfile" + target = "base" + tags = tag("base", "${FRAPPE_VERSION}") +} + +target "build" { + inherits = ["default-args"] + context = "." + dockerfile = "images/production/Containerfile" + target = "build" + tags = tag("build", "${FRAPPE_VERSION}") +} diff --git a/images/layered/Containerfile b/images/layered/Containerfile new file mode 100644 index 00000000..c2656ade --- /dev/null +++ b/images/layered/Containerfile @@ -0,0 +1,47 @@ +ARG FRAPPE_BRANCH=version-15 +ARG FRAPPE_PATH=https://github.com/frappe/frappe + +FROM frappe/build:${FRAPPE_BRANCH} AS builder + +RUN export APP_INSTALL_ARGS="" && \ + if [ -n "${APPS_JSON_BASE64}" ]; then \ + export APP_INSTALL_ARGS="--apps_path=/opt/frappe/apps.json"; \ + fi && \ + bench init ${APP_INSTALL_ARGS}\ + --frappe-branch=${FRAPPE_BRANCH} \ + --frappe-path=${FRAPPE_PATH} \ + --no-procfile \ + --no-backups \ + --skip-redis-config-generation \ + --verbose \ + /home/frappe/frappe-bench && \ + cd /home/frappe/frappe-bench && \ + echo "{}" > sites/common_site_config.json && \ + find apps -mindepth 1 -path "*/.git" | xargs rm -fr + +FROM frappe/base:${FRAPPE_BRANCH} AS backend + +USER frappe + +COPY --from=builder --chown=frappe:frappe /home/frappe/frappe-bench /home/frappe/frappe-bench + +WORKDIR /home/frappe/frappe-bench + +VOLUME [ \ + "/home/frappe/frappe-bench/sites", \ + "/home/frappe/frappe-bench/sites/assets", \ + "/home/frappe/frappe-bench/logs" \ +] + +CMD [ \ + "/home/frappe/frappe-bench/env/bin/gunicorn", \ + "--chdir=/home/frappe/frappe-bench/sites", \ + "--bind=0.0.0.0:8000", \ + "--threads=4", \ + "--workers=2", \ + "--worker-class=gthread", \ + "--worker-tmp-dir=/dev/shm", \ + "--timeout=120", \ + "--preload", \ + "frappe.app:application" \ +] diff --git a/images/production/Containerfile b/images/production/Containerfile index fddfdeaf..78c80f73 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -70,7 +70,7 @@ RUN useradd -ms /bin/bash frappe \ COPY resources/nginx-template.conf /templates/nginx/frappe.conf.template COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh -FROM base AS builder +FROM base AS build RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ @@ -98,6 +98,8 @@ RUN apt-get update \ USER frappe +FROM build AS builder + ARG FRAPPE_BRANCH=version-15 ARG FRAPPE_PATH=https://github.com/frappe/frappe ARG ERPNEXT_REPO=https://github.com/frappe/erpnext From 44a357f7588ebd5448eea7609598400d2de72691 Mon Sep 17 00:00:00 2001 From: Rakshit Menpara <205111+deltasquare4@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:08:37 +0530 Subject: [PATCH 168/193] fix: invalid nested interpolation (#1496) Nested interpolation is not supported by docker (https://github.com/docker/cli/issues/4265). Changed the file so that it uses `CUSTOM_TAG` or `ERPNEXT_VERSION` if that's not available. --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index d9aa6ee1..628de532 100644 --- a/compose.yaml +++ b/compose.yaml @@ -2,7 +2,7 @@ x-customizable-image: &customizable_image # By default the image used only contains the `frappe` and `erpnext` apps. # See https://github.com/frappe/frappe_docker/blob/main/docs/custom-apps.md # about using custom images. - image: ${CUSTOM_IMAGE:-frappe/erpnext}:${CUSTOM_TAG:-${ERPNEXT_VERSION:?No ERPNext version or tag set}} + image: ${CUSTOM_IMAGE:-frappe/erpnext}:${CUSTOM_TAG:-$ERPNEXT_VERSION} pull_policy: ${PULL_POLICY:-always} x-depends-on-configurator: &depends_on_configurator From ebeac0ee43808445a67fe55ac2c29ea5a4486060 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 25 Oct 2024 14:33:26 +0530 Subject: [PATCH 169/193] ci: push base and build images (#1498) --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index db6d9ac0..6f10b150 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -59,7 +59,7 @@ target "bench-test" { # Base for all other targets group "default" { - targets = ["erpnext"] + targets = ["erpnext", "base", "build"] } function "tag" { From 3d6fb8c4b1f54c76736c418f8dda4e1f9781a709 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 25 Oct 2024 15:54:37 +0530 Subject: [PATCH 170/193] ci: push base and build images tags (#1499) --- docker-bake.hcl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-bake.hcl b/docker-bake.hcl index 6f10b150..9dc4c4c0 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -69,6 +69,8 @@ function "tag" { "${version}" == "develop" ? "${REGISTRY_USER}/${repo}:latest" : "${REGISTRY_USER}/${repo}:${version}", # Make short tag for major version if possible. For example, from v13.16.0 make v13. can(regex("(v[0-9]+)[.]", "${version}")) ? "${REGISTRY_USER}/${repo}:${regex("(v[0-9]+)[.]", "${version}")[0]}" : "", + # Make short tag for major version if possible. For example, from v13.16.0 make version-13. + can(regex("(v[0-9]+)[.]", "${version}")) ? "${REGISTRY_USER}/${repo}:version-${regex("([0-9]+)[.]", "${version}")[0]}" : "", ] } From a919f4450593bb66bf5e8aa302d117552452d460 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 27 Oct 2024 14:45:41 +0530 Subject: [PATCH 171/193] docs: quick build command (#1500) * docs: quick build command * chore: fix pre-commit lint for md file --- docs/custom-apps.md | 107 +++++++++++++++++++---------------- images/layered/Containerfile | 13 ++++- 2 files changed, 69 insertions(+), 51 deletions(-) diff --git a/docs/custom-apps.md b/docs/custom-apps.md index a3d4ef6c..d979aa5d 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -1,16 +1,11 @@ -### Clone frappe_docker and switch directory +### Load custom apps through apps.json file -```shell -git clone https://github.com/frappe/frappe_docker -cd frappe_docker -``` +Base64 encoded string of `apps.json` file needs to be passed in as build arg environment variable. -### Load custom apps through json +Create following `apps.json` file: -`apps.json` needs to be passed in as build arg environment variable. - -```shell -export APPS_JSON='[ +```json +[ { "url": "https://github.com/frappe/erpnext", "branch": "version-15" @@ -23,12 +18,16 @@ export APPS_JSON='[ "url": "https://{{ PAT }}@git.example.com/project/repository.git", "branch": "main" } -]' - -export APPS_JSON_BASE64=$(echo ${APPS_JSON} | base64 -w 0) +] ``` -You can also generate base64 string from json file: +Note: + +- `url` needs to be http(s) git url with personal access tokens without username eg:- `http://{{PAT}}@github.com/project/repository.git` in case of private repo. +- Add dependencies manually in `apps.json` e.g. add `erpnext` if you are installing `hrms`. +- Use fork repo or branch for ERPNext in case you need to use your fork or test a PR. + +Generate base64 string from json file: ```shell export APPS_JSON_BASE64=$(base64 -w 0 /path/to/apps.json) @@ -36,7 +35,7 @@ export APPS_JSON_BASE64=$(base64 -w 0 /path/to/apps.json) Test the Previous Step: Decode the Base64-encoded Environment Variable -To verify the previous step, decode the APPS_JSON_BASE64 environment variable (which is Base64-encoded) into a JSON file. Follow the steps below: +To verify the previous step, decode the `APPS_JSON_BASE64` environment variable (which is Base64-encoded) into a JSON file. Follow the steps below: 1. Use the following command to decode and save the output into a JSON file named apps-test-output.json: @@ -46,29 +45,48 @@ echo -n ${APPS_JSON_BASE64} | base64 -d > apps-test-output.json 2. Open the apps-test-output.json file to review the JSON output and ensure that the content is correct. -Note: - -- `url` needs to be http(s) git url with personal access tokens without username eg:- http://{{PAT}}@github.com/project/repository.git in case of private repo. -- add dependencies manually in `apps.json` e.g. add `payments` if you are installing `erpnext` -- use fork repo or branch for ERPNext in case you need to use your fork or test a PR. - -### Build Image +### Clone frappe_docker and switch directory ```shell -docker build \ - --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ - --tag=ghcr.io/user/repo/custom:1.0.0 \ - --file=images/custom/Containerfile . +git clone https://github.com/frappe/frappe_docker +cd frappe_docker ``` -Note: +### Configure build -- Use `buildah` instead of `docker` as per your setup. +Common build args. + +- `FRAPPE_PATH`, customize the source repo for frappe framework. Defaults to `https://github.com/frappe/frappe` +- `FRAPPE_BRANCH`, customize the source repo branch for frappe framework. Defaults to `version-15`. +- `APPS_JSON_BASE64`, correct base64 encoded JSON string generated from `apps.json` file. + +Notes + +- Use `buildah` or `docker` as per your setup. - Make sure `APPS_JSON_BASE64` variable has correct base64 encoded JSON string. It is consumed as build arg, base64 encoding ensures it to be friendly with environment variables. Use `jq empty apps.json` to validate `apps.json` file. - Make sure the `--tag` is valid image name that will be pushed to registry. See section [below](#use-images) for remarks about its use. - `.git` directories for all apps are removed from the image. -Customize these optional `--build-arg`s to use a different Frappe Framework repo and branch, or version of Python and NodeJS: +### Quick build image + +This method uses pre-built `frappe/base:${FRAPPE_BRANCH}` and `frappe/build:${FRAPPE_BRANCH}` image layers which come with required Python and NodeJS runtime. It speeds up the build time. + +It uses `images/layered/Containerfile`. + +```shell +docker build \ + --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \ + --build-arg=FRAPPE_BRANCH=version-15 \ + --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ + --tag=ghcr.io/user/repo/custom:1.0.0 \ + --file=images/layered/Containerfile . +``` + +### Custom build image + +This method builds the base and build layer every time, it allows to customize Python and NodeJS runtime versions. It takes more time to build. + +It uses `images/custom/Containerfile`. ```shell docker build \ @@ -81,39 +99,28 @@ docker build \ --file=images/custom/Containerfile . ``` +Custom build args, + +- `PYTHON_VERSION`, use the specified python version for base image. Default is `3.11.6`. +- `NODE_VERSION`, use the specified nodejs version, Default `18.18.2`. +- `DEBIAN_BASE` use the base Debian version, defaults to `bookworm`. +- `WKHTMLTOPDF_VERSION`, use the specified qt patched `wkhtmltopdf` version. Default is `0.12.6.1-3`. +- `WKHTMLTOPDF_DISTRO`, use the specified distro for debian package. Default is `bookworm`. + ### Push image to use in yaml files Login to `docker` or `buildah` ```shell -buildah login +docker login ``` Push image ```shell -buildah push ghcr.io/user/repo/custom:1.0.0 +docker push ghcr.io/user/repo/custom:1.0.0 ``` -### Use Kaniko - -Following executor args are required. Example runs locally in docker container. -You can run it part of CI/CD or part of your cluster. - -```shell -podman run --rm -it \ - -v "$HOME"/.docker/config.json:/kaniko/.docker/config.json \ - gcr.io/kaniko-project/executor:latest \ - --dockerfile=images/custom/Containerfile \ - --context=git://github.com/frappe/frappe_docker \ - --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ - --cache=true \ - --destination=ghcr.io/user/repo/custom:1.0.0 \ - --destination=ghcr.io/user/repo/custom:latest -``` - -More about [kaniko](https://github.com/GoogleContainerTools/kaniko) - ### Use Images In the [compose.yaml](../compose.yaml), you can set the image name and tag through environment variables, making it easier to customize. diff --git a/images/layered/Containerfile b/images/layered/Containerfile index c2656ade..12a089ee 100644 --- a/images/layered/Containerfile +++ b/images/layered/Containerfile @@ -1,8 +1,19 @@ ARG FRAPPE_BRANCH=version-15 -ARG FRAPPE_PATH=https://github.com/frappe/frappe FROM frappe/build:${FRAPPE_BRANCH} AS builder +ARG FRAPPE_BRANCH=version-15 +ARG FRAPPE_PATH=https://github.com/frappe/frappe +ARG APPS_JSON_BASE64 + +USER root + +RUN if [ -n "${APPS_JSON_BASE64}" ]; then \ + mkdir /opt/frappe && echo "${APPS_JSON_BASE64}" | base64 -d > /opt/frappe/apps.json; \ + fi + +USER frappe + RUN export APP_INSTALL_ARGS="" && \ if [ -n "${APPS_JSON_BASE64}" ]; then \ export APP_INSTALL_ARGS="--apps_path=/opt/frappe/apps.json"; \ From 234c036dc59c160858453329b237244e4018f09c Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 29 Oct 2024 15:58:08 +0000 Subject: [PATCH 172/193] 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 dd0249ca..c7321f2d 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.39.3 +ERPNEXT_VERSION=v15.39.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f4a1ef31..0e047a5b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.39.3 + image: frappe/erpnext:v15.39.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.39.3 + image: frappe/erpnext:v15.39.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.39.3 + image: frappe/erpnext:v15.39.5 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.39.3 + image: frappe/erpnext:v15.39.5 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.39.3 + image: frappe/erpnext:v15.39.5 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.39.3 + image: frappe/erpnext:v15.39.5 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.39.3 + image: frappe/erpnext:v15.39.5 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.39.3 + image: frappe/erpnext:v15.39.5 deploy: restart_policy: condition: on-failure From 560ad86b5b688cd9abf9b5a88e7c6a4245af7188 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 29 Oct 2024 17:48:24 +0000 Subject: [PATCH 173/193] 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 c7321f2d..c2d8ec55 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.39.5 +ERPNEXT_VERSION=v15.39.6 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0e047a5b..7bd50d08 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.39.5 + image: frappe/erpnext:v15.39.6 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.39.5 + image: frappe/erpnext:v15.39.6 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.39.5 + image: frappe/erpnext:v15.39.6 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.39.5 + image: frappe/erpnext:v15.39.6 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.39.5 + image: frappe/erpnext:v15.39.6 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.39.5 + image: frappe/erpnext:v15.39.6 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.39.5 + image: frappe/erpnext:v15.39.6 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.39.5 + image: frappe/erpnext:v15.39.6 deploy: restart_policy: condition: on-failure From 481fcc9410de9c541b1a4aecdb221a4f358bbbd1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 30 Oct 2024 10:01:36 +0000 Subject: [PATCH 174/193] 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 c2d8ec55..18c7708e 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.39.6 +ERPNEXT_VERSION=v15.40.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7bd50d08..60cd0704 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.39.6 + image: frappe/erpnext:v15.40.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.39.6 + image: frappe/erpnext:v15.40.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.39.6 + image: frappe/erpnext:v15.40.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.39.6 + image: frappe/erpnext:v15.40.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.39.6 + image: frappe/erpnext:v15.40.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.39.6 + image: frappe/erpnext:v15.40.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.39.6 + image: frappe/erpnext:v15.40.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.39.6 + image: frappe/erpnext:v15.40.0 deploy: restart_policy: condition: on-failure From 5d0d14dde86cf0eeab43642255608bad8592b158 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Lalonde Date: Mon, 4 Nov 2024 01:12:57 -0500 Subject: [PATCH 175/193] docs: clarify docker-compose and add steps to troubleshooting instructions (#1502) Add steps to the database debugging guide to include more possibilities and fix mysql instructions. Add explanation on the use of certain variables affected by network configuration. --- docs/environment-variables.md | 8 ++++---- docs/troubleshoot.md | 31 ++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/docs/environment-variables.md b/docs/environment-variables.md index 1dd5eae9..b1a44d9f 100644 --- a/docs/environment-variables.md +++ b/docs/environment-variables.md @@ -15,7 +15,7 @@ To bypass `nginx-entrypoint.sh`, mount desired `/etc/nginx/conf.d/default.conf` ## Configuration -We use environment variables to configure our setup. docker-compose uses variables from `.env` file. To get started, copy `example.env` to `.env`. +We use environment variables to configure our setup. docker-compose uses variables from the `environment:` section of the services defined within and the`.env` file, if present. Variables defined in the `.env` file are referenced via `${VARIABLE_NAME}` within the docker-compose `.yml` file. `example.env` contains a non-exhaustive list of possible configuration variables. To get started, copy `example.env` to `.env`. ### `FRAPPE_VERSION` @@ -27,7 +27,7 @@ Password for MariaDB (or Postgres) database. ### `DB_HOST` -Hostname for MariaDB (or Postgres) database. Set only if external service for database is used. +Hostname for MariaDB (or Postgres) database. Set only if external service for database is used or the container can not be reached by its service name (db) by other containers. ### `DB_PORT` @@ -35,11 +35,11 @@ Port for MariaDB (3306) or Postgres (5432) database. Set only if external servic ### `REDIS_CACHE` -Hostname for redis server to store cache. Set only if external service for redis is used. +Hostname for redis server to store cache. Set only if external service for redis is used or the container can not be reached by its service name (redis-cache) by other containers. ### `REDIS_QUEUE` -Hostname for redis server to store queue data and socketio. 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 or the container can not be reached by its service name (redis-queue) by other containers. ### `ERPNEXT_VERSION` diff --git a/docs/troubleshoot.md b/docs/troubleshoot.md index 68718280..4c20dfe1 100644 --- a/docs/troubleshoot.md +++ b/docs/troubleshoot.md @@ -4,9 +4,16 @@ ### Fixing MariaDB issues after rebuilding the container -For any reason after rebuilding the container if you are not be able to access MariaDB correctly with the previous configuration. Follow these instructions. +For any reason after rebuilding the container if you are not be able to access MariaDB correctly (i.e. `Access denied for user [...]`) with the previous configuration. Follow these instructions. -The parameter `'db_name'@'%'` needs to be set in MariaDB and permission to the site database suitably assigned to the user. +First test for network issues. Manually connect to the database through the `backend` container: +``` +docker exec -it frappe_docker-backend-1 bash +mysql -uroot -padmin -hdb +``` +Replace `root` with the database root user name, `admin` with the root password, and `db` with the service name specified in the docker-compose `.yml` configuration file. If the connection to the database is successful, then the network configuration is correct and you can proceed to the next step. Otherwise, modify the docker-compose `.yml` configuration file, in the `configurator` service's `environment` section, to use the container names (`frappe_docker-db-1`, `frappe_docker-redis-cache-1`, `frappe_docker-redis-queue-1` or as otherwise shown with `docker ps`) instead of the service names and rebuild the containers. + +Then, the parameter `'db_name'@'%'` needs to be set in MariaDB and permission to the site database suitably assigned to the user. This step has to be repeated for all sites available under the current bench. Example shows the queries to be executed for site `localhost` @@ -22,19 +29,29 @@ and take note of the parameters `db_name` and `db_password`. Enter MariaDB Interactive shell: ```shell -mysql -uroot -p123 -hmariadb +mysql -uroot -padmin -hdb ``` -Execute following queries replacing `db_name` and `db_password` with the values found in site_config.json. +The parameter `'db_name'@'%'` must not be duplicated. Verify that it is unique with the command: +``` +SELECT User, Host FROM mysql.user; +``` + +Delete duplicated entries, if found, with the following: +``` +DROP USER 'db_name'@'host'; +``` + +Modify permissions by executing following queries replacing `db_name` and `db_password` with the values found in site_config.json. ```sql -UPDATE mysql.user SET Host = '%' where User = 'db_name'; FLUSH PRIVILEGES; +UPDATE mysql.global_priv SET Host = '%' where User = 'db_name'; FLUSH PRIVILEGES; SET PASSWORD FOR 'db_name'@'%' = PASSWORD('db_password'); FLUSH PRIVILEGES; -GRANT ALL PRIVILEGES ON `db_name`.* TO 'db_name'@'%'; FLUSH PRIVILEGES; +GRANT ALL PRIVILEGES ON `db_name`.* TO 'db_name'@'%' IDENTIFIED BY 'db_password' WITH GRANT OPTION; FLUSH PRIVILEGES; EXIT; ``` -Note: For MariaDB 10.4 and above use `mysql.global_priv` instead of `mysql.user`. +Note: For MariaDB 10.3 and older use `mysql.user` instead of `mysql.global_priv`. ### docker-compose does not recognize variables from `.env` file From b24a4109c8c00a0a994731dacfcc18657dd3e233 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 4 Nov 2024 16:59:47 +0530 Subject: [PATCH 176/193] chore: fix pre-commit lint for md file (#1503) --- docs/troubleshoot.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/troubleshoot.md b/docs/troubleshoot.md index 4c20dfe1..7ddbe657 100644 --- a/docs/troubleshoot.md +++ b/docs/troubleshoot.md @@ -7,13 +7,15 @@ For any reason after rebuilding the container if you are not be able to access MariaDB correctly (i.e. `Access denied for user [...]`) with the previous configuration. Follow these instructions. First test for network issues. Manually connect to the database through the `backend` container: + ``` docker exec -it frappe_docker-backend-1 bash mysql -uroot -padmin -hdb ``` + Replace `root` with the database root user name, `admin` with the root password, and `db` with the service name specified in the docker-compose `.yml` configuration file. If the connection to the database is successful, then the network configuration is correct and you can proceed to the next step. Otherwise, modify the docker-compose `.yml` configuration file, in the `configurator` service's `environment` section, to use the container names (`frappe_docker-db-1`, `frappe_docker-redis-cache-1`, `frappe_docker-redis-queue-1` or as otherwise shown with `docker ps`) instead of the service names and rebuild the containers. -Then, the parameter `'db_name'@'%'` needs to be set in MariaDB and permission to the site database suitably assigned to the user. +Then, the parameter `'db_name'@'%'` needs to be set in MariaDB and permission to the site database suitably assigned to the user. This step has to be repeated for all sites available under the current bench. Example shows the queries to be executed for site `localhost` @@ -33,11 +35,13 @@ mysql -uroot -padmin -hdb ``` The parameter `'db_name'@'%'` must not be duplicated. Verify that it is unique with the command: + ``` SELECT User, Host FROM mysql.user; ``` Delete duplicated entries, if found, with the following: + ``` DROP USER 'db_name'@'host'; ``` From 41f67d9b6aa0d344d468efc1815070e92e9c1031 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Nov 2024 05:31:07 +0000 Subject: [PATCH 177/193] 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 18c7708e..e5cd2800 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.40.0 +ERPNEXT_VERSION=v15.41.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 60cd0704..8f2f94ab 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.40.0 + image: frappe/erpnext:v15.41.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.40.0 + image: frappe/erpnext:v15.41.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.40.0 + image: frappe/erpnext:v15.41.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.40.0 + image: frappe/erpnext:v15.41.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.40.0 + image: frappe/erpnext:v15.41.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.40.0 + image: frappe/erpnext:v15.41.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.40.0 + image: frappe/erpnext:v15.41.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.40.0 + image: frappe/erpnext:v15.41.0 deploy: restart_policy: condition: on-failure From faa2065026bc74daf436f7123173f4038ff3b0d7 Mon Sep 17 00:00:00 2001 From: "Dr.Blank" Date: Thu, 7 Nov 2024 09:10:13 +0530 Subject: [PATCH 178/193] docs: fix grammar in administrator password instructions (#1504) Correct redundant wording and improve clarity in site creation documentation. --- docs/development.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/development.md b/docs/development.md index 5f56d915..89b20ec2 100644 --- a/docs/development.md +++ b/docs/development.md @@ -238,7 +238,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. `Administrator` password is for created sites is `admin`. +This is simplified using a script to automate the process of creating a new bench / site and installing the required apps. The `Administrator` password 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. From 0d35785d41a548545c9e61da8584307349dc83a6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 7 Nov 2024 12:53:18 +0000 Subject: [PATCH 179/193] 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 e5cd2800..58b3b88c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.41.0 +ERPNEXT_VERSION=v15.41.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8f2f94ab..1f10cd3f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.41.0 + image: frappe/erpnext:v15.41.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.41.0 + image: frappe/erpnext:v15.41.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.41.0 + image: frappe/erpnext:v15.41.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.41.0 + image: frappe/erpnext:v15.41.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.41.0 + image: frappe/erpnext:v15.41.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.41.0 + image: frappe/erpnext:v15.41.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.41.0 + image: frappe/erpnext:v15.41.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.41.0 + image: frappe/erpnext:v15.41.1 deploy: restart_policy: condition: on-failure From 285abd0b0764b8a1ffd95155d64c52833c5cb57a Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 8 Nov 2024 09:21:06 +0000 Subject: [PATCH 180/193] 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 58b3b88c..b116a7ec 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.41.1 +ERPNEXT_VERSION=v15.41.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1f10cd3f..7f5f123e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.41.1 + image: frappe/erpnext:v15.41.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.41.1 + image: frappe/erpnext:v15.41.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.41.1 + image: frappe/erpnext:v15.41.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.41.1 + image: frappe/erpnext:v15.41.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.41.1 + image: frappe/erpnext:v15.41.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.41.1 + image: frappe/erpnext:v15.41.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.41.1 + image: frappe/erpnext:v15.41.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.41.1 + image: frappe/erpnext:v15.41.2 deploy: restart_policy: condition: on-failure From 88ac02198aaf148bdd7745b354afd7353c2a42c4 Mon Sep 17 00:00:00 2001 From: rexeo-asia <72854949+rexeo-asia@users.noreply.github.com> Date: Mon, 11 Nov 2024 14:11:56 +0800 Subject: [PATCH 181/193] Update docker-build-push.yml to support arm64 (#1492) --- .github/workflows/docker-build-push.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index e5e9fda9..3b79bc7a 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -37,6 +37,9 @@ jobs: image: registry:2 ports: - 5000:5000 + strategy: + matrix: + arch: [amd64, arm64] steps: - name: Checkout @@ -46,6 +49,7 @@ jobs: uses: docker/setup-buildx-action@v3 with: driver-opts: network=host + platforms: linux/${{ matrix.arch }} - name: Get latest versions run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} From 641550dce9bd1dc1193e0497ad6b88e4d62b3150 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 11 Nov 2024 11:52:27 +0530 Subject: [PATCH 182/193] ci: push frappe or erpnext branch as tag (#1508) * ci: push frappe or erpnext branch as tag * ci: build arm64 images * revert: build arm64 images --- docker-bake.hcl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 9dc4c4c0..3304ce40 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -65,6 +65,8 @@ group "default" { function "tag" { params = [repo, version] result = [ + # Push frappe or erpnext branch as tag + "${REGISTRY_USER}/${repo}:${version}", # If `version` param is develop (development build) then use tag `latest` "${version}" == "develop" ? "${REGISTRY_USER}/${repo}:latest" : "${REGISTRY_USER}/${repo}:${version}", # Make short tag for major version if possible. For example, from v13.16.0 make v13. @@ -107,5 +109,5 @@ target "build" { context = "." dockerfile = "images/production/Containerfile" target = "build" - tags = tag("build", "${FRAPPE_VERSION}") + tags = tag("build", "${ERPNEXT_VERSION}") } From 6b50a5752644c7550cce881b1466d4ec05243205 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 12 Nov 2024 14:39:09 +0530 Subject: [PATCH 183/193] docs: fix logs command (#1509) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5eece84d..114adfcf 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Then run: `docker compose -f pwd.yml up -d` Wait for 5 minutes for ERPNext site to be created or check `create-site` container logs before opening browser on port 8080. (username: `Administrator`, password: `admin`) -If you ran in a Dev Docker environment, to view container logs: `docker compose -f pwd.yml -d`. Don't worry about some of the initial error messages, some services take a while to become ready, and then they go away. +If you ran in a Dev Docker environment, to view container logs: `docker compose -f pwd.yml logs -f create-site`. Don't worry about some of the initial error messages, some services take a while to become ready, and then they go away. # Documentation From a19e8b4aaa9ca6dda3955c23c8c5256ecf095612 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 13 Nov 2024 15:10:05 +0000 Subject: [PATCH 184/193] 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 b116a7ec..0c2f51b3 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.41.2 +ERPNEXT_VERSION=v15.42.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7f5f123e..d60c24cd 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.41.2 + image: frappe/erpnext:v15.42.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.41.2 + image: frappe/erpnext:v15.42.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.41.2 + image: frappe/erpnext:v15.42.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.41.2 + image: frappe/erpnext:v15.42.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.41.2 + image: frappe/erpnext:v15.42.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.41.2 + image: frappe/erpnext:v15.42.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.41.2 + image: frappe/erpnext:v15.42.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.41.2 + image: frappe/erpnext:v15.42.0 deploy: restart_policy: condition: on-failure From 324d9db4611b8ee57eae4d245eea83a2962e4967 Mon Sep 17 00:00:00 2001 From: rexeo-asia <72854949+rexeo-asia@users.noreply.github.com> Date: Fri, 15 Nov 2024 19:24:53 +0800 Subject: [PATCH 185/193] Update docker-build-push.yml (#1512) Fixes https://github.com/frappe/frappe_docker/issues/1511, add docker/setup-qemu-action@v3 step --- .github/workflows/docker-build-push.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 3b79bc7a..dac92bf1 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -45,6 +45,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Setup Buildx uses: docker/setup-buildx-action@v3 with: From 1c6f58c9868a95e1e31cc99abeee6ae97a4abfb5 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 18 Nov 2024 16:23:09 +0530 Subject: [PATCH 186/193] docs: fix broken link (#1516) fixes #1510 --- docs/list-of-containers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/list-of-containers.md b/docs/list-of-containers.md index 4ccf66ee..5ed757d5 100644 --- a/docs/list-of-containers.md +++ b/docs/list-of-containers.md @@ -2,7 +2,7 @@ There are 3 images that you can find in `/images` directory: -- `bench`. It is used for development. [Learn more how to start development](../development/README.md). +- `bench`. It is used for development. [Learn more how to start development](development.md). - `production`. - Multi-purpose Python backend. Runs [Werkzeug server](https://werkzeug.palletsprojects.com/en/2.0.x/) with [gunicorn](https://gunicorn.org), queues (via `bench worker`), or schedule (via `bench schedule`). - Contains JS and CSS assets and routes incoming requests using [nginx](https://www.nginx.com). From 1997d0d4f1b03ec6264bf0f452dcfdebe85a11d2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Nov 2024 08:46:46 +0000 Subject: [PATCH 187/193] 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 0c2f51b3..c392023d 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.42.0 +ERPNEXT_VERSION=v15.43.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index d60c24cd..299bac52 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.42.0 + image: frappe/erpnext:v15.43.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.42.0 + image: frappe/erpnext:v15.43.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.42.0 + image: frappe/erpnext:v15.43.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.42.0 + image: frappe/erpnext:v15.43.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.42.0 + image: frappe/erpnext:v15.43.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.42.0 + image: frappe/erpnext:v15.43.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.42.0 + image: frappe/erpnext:v15.43.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.42.0 + image: frappe/erpnext:v15.43.0 deploy: restart_policy: condition: on-failure From 8ac8e75289792efe2759e98d615ff76ab1ca16e8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 21 Nov 2024 09:54:09 +0000 Subject: [PATCH 188/193] 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 c392023d..12e62c3b 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.43.0 +ERPNEXT_VERSION=v15.43.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 299bac52..13c30f0a 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.43.0 + image: frappe/erpnext:v15.43.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.43.0 + image: frappe/erpnext:v15.43.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.43.0 + image: frappe/erpnext:v15.43.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.43.0 + image: frappe/erpnext:v15.43.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.43.0 + image: frappe/erpnext:v15.43.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.43.0 + image: frappe/erpnext:v15.43.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.43.0 + image: frappe/erpnext:v15.43.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.43.0 + image: frappe/erpnext:v15.43.1 deploy: restart_policy: condition: on-failure From 544892ff3ea6811f1c7d21d7d79dd3fa3889e47b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 22 Nov 2024 06:09:58 +0000 Subject: [PATCH 189/193] 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 12e62c3b..f4217a62 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.43.1 +ERPNEXT_VERSION=v15.43.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 13c30f0a..36244a39 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.43.1 + image: frappe/erpnext:v15.43.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.43.1 + image: frappe/erpnext:v15.43.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.43.1 + image: frappe/erpnext:v15.43.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.43.1 + image: frappe/erpnext:v15.43.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.43.1 + image: frappe/erpnext:v15.43.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.43.1 + image: frappe/erpnext:v15.43.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.43.1 + image: frappe/erpnext:v15.43.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.43.1 + image: frappe/erpnext:v15.43.2 deploy: restart_policy: condition: on-failure From 657dfbb939dbdfd39a952c3fa474142719241f7f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 22 Nov 2024 09:28:41 +0000 Subject: [PATCH 190/193] 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 f4217a62..7b1b9ecb 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.43.2 +ERPNEXT_VERSION=v15.43.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 36244a39..1606cb0d 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.43.2 + image: frappe/erpnext:v15.43.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.43.2 + image: frappe/erpnext:v15.43.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.43.2 + image: frappe/erpnext:v15.43.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.43.2 + image: frappe/erpnext:v15.43.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.43.2 + image: frappe/erpnext:v15.43.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.43.2 + image: frappe/erpnext:v15.43.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.43.2 + image: frappe/erpnext:v15.43.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.43.2 + image: frappe/erpnext:v15.43.3 deploy: restart_policy: condition: on-failure From 99a3600d367ecf4801e26ebecf3f345905c0c022 Mon Sep 17 00:00:00 2001 From: V3 Date: Tue, 26 Nov 2024 11:37:20 +0100 Subject: [PATCH 191/193] Changed pwd.yml (#1519) * Update pwd.yml changed some parameters, since syntax has changed: - bench parameter for mariadb password is different - mariadb parameter for password has changed * fix: create site command in pwd.yml * fix: create site command in pwd.yml remove deprecated option and use new --------- Co-authored-by: Revant Nandgaonkar --- pwd.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pwd.yml b/pwd.yml index 1606cb0d..839f9c25 100644 --- a/pwd.yml +++ b/pwd.yml @@ -67,7 +67,7 @@ services: fi done; echo "sites/common_site_config.json found"; - bench new-site --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; + bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-username=root --db-root-password=admin --install-app erpnext --set-default frontend; db: image: mariadb:10.6 @@ -85,6 +85,7 @@ services: - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 environment: MYSQL_ROOT_PASSWORD: admin + MARIADB_ROOT_PASSWORD: admin volumes: - db-data:/var/lib/mysql From 17753dd8e0ae0541907b6ad056850f05ab7ba64f Mon Sep 17 00:00:00 2001 From: Sharon P Raju <47088116+sharonpraju@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:01:18 +0530 Subject: [PATCH 192/193] Updated README.md (arm64 architecture) (#1520) * Update README.md Added documentation to run on arm64 architecture. * fix: lint --------- Co-authored-by: Revant Nandgaonkar --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 114adfcf..b68905a5 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,19 @@ cd frappe_docker Then run: `docker compose -f pwd.yml up -d` +### To run on ARM64 architecture follow this instructions + +After cloning the repo run this command to build multi-architecture images specifically for ARM64. + +`docker buildx bake --no-cache --set *.platform=linux/arm64` + +and then + +- add `platform: linux/arm64` to all services in the pwd.yaml +- replace the current specified versions of erpnext image on `pwd.yml` with `:latest` + +Then run: `docker compose -f pwd.yml up -d` + ## Final steps Wait for 5 minutes for ERPNext site to be created or check `create-site` container logs before opening browser on port 8080. (username: `Administrator`, password: `admin`) From 4ade236eb0239ceebea837f66f6e7286c568cb2d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Nov 2024 16:11:05 +0000 Subject: [PATCH 193/193] 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 7b1b9ecb..54ff0ef7 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.43.3 +ERPNEXT_VERSION=v15.44.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 839f9c25..dc4cbcbf 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.43.3 + image: frappe/erpnext:v15.44.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.43.3 + image: frappe/erpnext:v15.44.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.43.3 + image: frappe/erpnext:v15.44.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.43.3 + image: frappe/erpnext:v15.44.0 depends_on: - websocket deploy: @@ -114,7 +114,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.43.3 + image: frappe/erpnext:v15.44.0 deploy: restart_policy: condition: on-failure @@ -128,7 +128,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.43.3 + image: frappe/erpnext:v15.44.0 deploy: restart_policy: condition: on-failure @@ -158,7 +158,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.43.3 + image: frappe/erpnext:v15.44.0 deploy: restart_policy: condition: on-failure @@ -170,7 +170,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.43.3 + image: frappe/erpnext:v15.44.0 deploy: restart_policy: condition: on-failure