From 168f25dfbfaddce6f2faa00332dbcbe60d0fb7b6 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 28 Jun 2022 07:44:44 +0000
Subject: [PATCH 01/54] 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 ec796ffc..f24a02da 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v13.34.0
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.34.1
+ERPNEXT_VERSION=v13.34.2
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index fb7b56de..e3625ef1 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.34.1
+    image: frappe/erpnext-worker:v13.34.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.34.1
+    image: frappe/erpnext-worker:v13.34.2
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.34.1
+    image: frappe/erpnext-worker:v13.34.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -74,7 +74,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.34.1
+    image: frappe/erpnext-nginx:v13.34.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -92,7 +92,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.34.1
+    image: frappe/erpnext-worker:v13.34.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -105,7 +105,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.34.1
+    image: frappe/erpnext-worker:v13.34.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -118,7 +118,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.34.1
+    image: frappe/erpnext-worker:v13.34.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -139,7 +139,7 @@ services:
       - redis-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.34.1
+    image: frappe/erpnext-worker:v13.34.2
     deploy:
       restart_policy:
         condition: on-failure

From 0b60d9a1700b273624857777185b915986dcefa7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 17:59:03 +0530
Subject: [PATCH 02/54] chore(deps): Update pre-commit hooks (#833)

Co-authored-by: vrslev <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 cd5d88ae..cc16e008 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: 22.3.0
+    rev: 22.6.0
     hooks:
       - id: black
 

From 730e14b6cd635e3251dbb95a83193784bccea4b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 18:00:01 +0530
Subject: [PATCH 03/54] chore(deps-dev): bump black from 22.3.0 to 22.6.0
 (#834)

Bumps [black](https://github.com/psf/black) from 22.3.0 to 22.6.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.3.0...22.6.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 01b43fee..cd9dbbbd 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,3 @@
 frappe @ git+https://github.com/frappe/frappe.git
 boto3-stubs[s3]
-black==22.3.0
+black==22.6.0

From 1754e6872fdddd27664d5a9ea0ced90fac93e26c Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sun, 3 Jul 2022 15:09:10 +0530
Subject: [PATCH 04/54] add python 3.10 (#837)

* fix: use py 3.10 for v14

closes #836

* docs: update development readme for py versions

* ci: update github actions py version to 3.10

* Quote Python version in yaml files

* fix: typo in environment variable

Co-authored-by: Lev Vereshchagin <mail@vrslev.com>
---
 .github/workflows/build_stable.yml      |  2 +-
 .github/workflows/docker-build-push.yml |  2 +-
 .github/workflows/lint.yml              |  2 +-
 development/README.md                   | 16 ++++++++++++++--
 docker-bake.hcl                         |  4 ++--
 images/bench/Dockerfile                 |  6 ++++--
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
index 4188ac5c..3f62bfc0 100644
--- a/.github/workflows/build_stable.yml
+++ b/.github/workflows/build_stable.yml
@@ -77,7 +77,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Get latest versions
         run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 13
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 22da458b..358e1df7 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Install Docker Compose v2
         uses: ndeloof/install-compose-action@4a33bc31f327b8231c4f343f6fba704fedc0fa23
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ddae51d2..97b1b04a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       # For shfmt pre-commit hook
       - name: Setup Go
diff --git a/development/README.md b/development/README.md
index d13a32c7..7e787782 100644
--- a/development/README.md
+++ b/development/README.md
@@ -64,11 +64,23 @@ Notes:
 Run the following commands in the terminal inside the container. You might need to create a new terminal in VSCode.
 
 ```shell
-bench init --skip-redis-config-generation --frappe-branch version-13 frappe-bench
+bench init --skip-redis-config-generation frappe-bench
 cd frappe-bench
 ```
 
-Note: For version 12 use Python 3.7 by passing option to `bench init` command, e.g. `bench init --skip-redis-config-generation --frappe-branch version-12 --python python3.7 frappe-bench`
+For version 13 use Python 3.9 by passing option to `bench init` command,
+
+```shell
+bench init --skip-redis-config-generation --frappe-branch version-13 --python python3.9 frappe-bench
+cd frappe-bench
+```
+
+For version 12 use Python 3.7 by passing option to `bench init` command,
+
+```shell
+bench init --skip-redis-config-generation --frappe-branch version-12 --python python3.7 frappe-bench
+cd frappe-bench
+```
 
 ### Setup hosts
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index cd47b824..bf8eeca7 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -73,8 +73,8 @@ target "default-args" {
         BENCH_REPO = "${BENCH_REPO}"
         FRAPPE_VERSION = "${FRAPPE_VERSION}"
         ERPNEXT_VERSION = "${ERPNEXT_VERSION}"
-        # If `ERPNEXT_VERSION` variable contains "v12" use Python 3.7. Else — 3.9.
-        PYTHON_VERSION = can(regex("v12", "${ERPNEXT_VERSION}")) ? "3.7" : "3.9"
+        # If `ERPNEXT_VERSION` variable contains "v12" use Python 3.7. If "v13" — 3.9. Else 3.10.
+        PYTHON_VERSION = can(regex("v12", "${ERPNEXT_VERSION}")) ? "3.7" : can(regex("v13", "${ERPNEXT_VERSION}")) ? "3.9" : "3.10"
     }
 }
 
diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile
index a963425e..5c63a72d 100644
--- a/images/bench/Dockerfile
+++ b/images/bench/Dockerfile
@@ -79,15 +79,17 @@ WORKDIR /home/frappe
 # Python 3.7 sits here for ERPNext version-12
 # TODO: Remove Python 3.7 when version-12 will not be supported
 ENV PYTHON_VERSION_V12=3.7.12
-ENV PYTHON_VERSION=3.9.9
+ENV PYTHON_VERSION_V13=3.9.9
+ENV PYTHON_VERSION=3.10.5
 ENV PYENV_ROOT /home/frappe/.pyenv
 ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 
 # From https://github.com/pyenv/pyenv#basic-github-checkout
 RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \
     && pyenv install $PYTHON_VERSION_V12 \
+    && pyenv install $PYTHON_VERSION_V13 \
     && pyenv install $PYTHON_VERSION \
-    && pyenv global $PYTHON_VERSION $PYTHON_VERSION_V12 \
+    && pyenv global $PYTHON_VERSION $PYTHON_VERSION_V12 $PYTHON_VERSION_v13 \
     && sed -Ei -e '/^([^#]|$)/ {a export PYENV_ROOT="/home/frappe/.pyenv" a export PATH="$PYENV_ROOT/bin:$PATH" a ' -e ':a' -e '$!{n;ba};}' ~/.profile \
     && echo 'eval "$(pyenv init --path)"' >>~/.profile \
     && echo 'eval "$(pyenv init -)"' >>~/.bashrc

From 369e6dd31ef25d273288b2e5055b990ecc8861ca Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sun, 3 Jul 2022 15:25:52 +0530
Subject: [PATCH 05/54] docs: mention to install honcho in env (#839)

closes #816
---
 development/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/development/README.md b/development/README.md
index 7e787782..8263dd1a 100644
--- a/development/README.md
+++ b/development/README.md
@@ -110,6 +110,8 @@ Note : With the option '--skip-redis-config-generation' during bench init, these
 
 Honcho is the tool used by Bench to manage all the processes Frappe requires. Usually, these all run in localhost, but in this case, we have external containers for Redis. For this reason, we have to stop Honcho from trying to start Redis processes.
 
+Honcho is installed in global python environment along with bench. To make it available locally you've to install it in every `frappe-bench/env` you create. Install it using command `./env/bin/pip install honcho`. It is required locally if you wish to use is as part of VSCode launch configuration.
+
 Open the Procfile file and remove the three lines containing the configuration from Redis, either by editing manually the file:
 
 ```shell

From fcf18ca70988cb79677acc2e943b21f912d880b2 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 5 Jul 2022 09:02:07 +0000
Subject: [PATCH 06/54] chore: Update example.env

---
 example.env |  4 ++--
 pwd.yml     | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/example.env b/example.env
index f24a02da..bb7071eb 100644
--- a/example.env
+++ b/example.env
@@ -1,9 +1,9 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-FRAPPE_VERSION=v13.34.0
+FRAPPE_VERSION=v13.35.0
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.34.2
+ERPNEXT_VERSION=v13.35.0
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index e3625ef1..7111c81b 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.34.2
+    image: frappe/erpnext-worker:v13.35.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.34.2
+    image: frappe/erpnext-worker:v13.35.0
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.34.2
+    image: frappe/erpnext-worker:v13.35.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -74,7 +74,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.34.2
+    image: frappe/erpnext-nginx:v13.35.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -92,7 +92,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.34.2
+    image: frappe/erpnext-worker:v13.35.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -105,7 +105,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.34.2
+    image: frappe/erpnext-worker:v13.35.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -118,7 +118,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.34.2
+    image: frappe/erpnext-worker:v13.35.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -139,7 +139,7 @@ services:
       - redis-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.34.2
+    image: frappe/erpnext-worker:v13.35.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -150,7 +150,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.34.0
+    image: frappe/frappe-socketio:v13.35.0
     deploy:
       restart_policy:
         condition: on-failure

From c25fd6271ba8a9399f72aef74d7c0c97ad8c043f Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 8 Jul 2022 10:33:24 +0000
Subject: [PATCH 07/54] 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 bb7071eb..ada506af 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v13.35.0
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.35.0
+ERPNEXT_VERSION=v13.35.1
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 7111c81b..cf502921 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.35.0
+    image: frappe/erpnext-worker:v13.35.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.35.0
+    image: frappe/erpnext-worker:v13.35.1
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.35.0
+    image: frappe/erpnext-worker:v13.35.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -74,7 +74,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.35.0
+    image: frappe/erpnext-nginx:v13.35.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -92,7 +92,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.35.0
+    image: frappe/erpnext-worker:v13.35.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -105,7 +105,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.35.0
+    image: frappe/erpnext-worker:v13.35.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -118,7 +118,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.35.0
+    image: frappe/erpnext-worker:v13.35.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -139,7 +139,7 @@ services:
       - redis-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.35.0
+    image: frappe/erpnext-worker:v13.35.1
     deploy:
       restart_policy:
         condition: on-failure

From a4bd7ff976f3efc14640c2079ce692cb902acecb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 11 Jul 2022 10:24:04 +0530
Subject: [PATCH 08/54] chore(deps): Update pre-commit hooks (#845)

Co-authored-by: vrslev <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 cc16e008..d96814b9 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: v2.34.0
+    rev: v2.35.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]

From cc7bf69ec64f4a8e2cf58d33b2e94826c1abf9c8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 12 Jul 2022 04:09:59 +0530
Subject: [PATCH 09/54] chore(deps): Update pre-commit hooks (#846)

Co-authored-by: vrslev <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 d96814b9..5f7a9101 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: v2.35.0
+    rev: v2.37.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]

From bf49bf75eda41a7a2e6b2c67f118062971489c8d Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 12 Jul 2022 08:06:13 +0000
Subject: [PATCH 10/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index ada506af..ede4d565 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
 
-FRAPPE_VERSION=v13.35.0
+FRAPPE_VERSION=v13.35.1
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v13.35.1
diff --git a/pwd.yml b/pwd.yml
index cf502921..79034c11 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -150,7 +150,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.35.0
+    image: frappe/frappe-socketio:v13.35.1
     deploy:
       restart_policy:
         condition: on-failure

From f99649be919c0960c0920729d3c4f0b4d127a897 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 12 Jul 2022 09:45:22 +0000
Subject: [PATCH 11/54] 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 ede4d565..a32437c2 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v13.35.1
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.35.1
+ERPNEXT_VERSION=v13.35.2
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 79034c11..6fead2e9 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.35.1
+    image: frappe/erpnext-worker:v13.35.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.35.1
+    image: frappe/erpnext-worker:v13.35.2
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.35.1
+    image: frappe/erpnext-worker:v13.35.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -74,7 +74,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.35.1
+    image: frappe/erpnext-nginx:v13.35.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -92,7 +92,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.35.1
+    image: frappe/erpnext-worker:v13.35.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -105,7 +105,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.35.1
+    image: frappe/erpnext-worker:v13.35.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -118,7 +118,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.35.1
+    image: frappe/erpnext-worker:v13.35.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -139,7 +139,7 @@ services:
       - redis-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.35.1
+    image: frappe/erpnext-worker:v13.35.2
     deploy:
       restart_policy:
         condition: on-failure

From 6f97bfa07e2ba23d32617fcb58950ed0b3dbcd45 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 04:03:03 +0530
Subject: [PATCH 12/54] chore(deps): Update pre-commit hooks (#848)

Co-authored-by: vrslev <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 5f7a9101..8ff2f6e5 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: v2.37.0
+    rev: v2.37.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus]

From 6bd457b33c711c6144cfcb793d0a7d845ecfe236 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 14 Jul 2022 08:23:04 +0000
Subject: [PATCH 13/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index a32437c2..a8242fa4 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
 
-FRAPPE_VERSION=v13.35.1
+FRAPPE_VERSION=v13.35.2
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v13.35.2
diff --git a/pwd.yml b/pwd.yml
index 6fead2e9..9d99f8e9 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -150,7 +150,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.35.1
+    image: frappe/frappe-socketio:v13.35.2
     deploy:
       restart_policy:
         condition: on-failure

From 4e63052a5448eda90c0be3ccf9efc39a83f0027c Mon Sep 17 00:00:00 2001
From: Mauricio Vidal <MrMauro@users.noreply.github.com>
Date: Fri, 15 Jul 2022 01:01:30 -0500
Subject: [PATCH 14/54] Update setup-options.md (#850)

Link correction
---
 docs/setup-options.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setup-options.md b/docs/setup-options.md
index 3c6436d2..bc74d4d1 100644
--- a/docs/setup-options.md
+++ b/docs/setup-options.md
@@ -17,7 +17,7 @@ Copy the example docker environment file to `.env`:
 cp example.env .env
 ```
 
-Note: To know more about environment variable [read here](./images-and-compose-files#configuration). Set the necessary variables in the `.env` file.
+Note: To know more about environment variable [read here](./images-and-compose-files.md#configuration). Set the necessary variables in the `.env` file.
 
 ## Generate docker-compose.yml for variety of setups
 

From a2303920649db8d34ca64b08592403e84619587d Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Mon, 18 Jul 2022 05:37:18 +0000
Subject: [PATCH 15/54] 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 a8242fa4..9efbc9f1 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v13.35.2
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.35.2
+ERPNEXT_VERSION=v13.35.3
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 9d99f8e9..6185f272 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.35.2
+    image: frappe/erpnext-worker:v13.35.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.35.2
+    image: frappe/erpnext-worker:v13.35.3
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.35.2
+    image: frappe/erpnext-worker:v13.35.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -74,7 +74,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.35.2
+    image: frappe/erpnext-nginx:v13.35.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -92,7 +92,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.35.2
+    image: frappe/erpnext-worker:v13.35.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -105,7 +105,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.35.2
+    image: frappe/erpnext-worker:v13.35.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -118,7 +118,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.35.2
+    image: frappe/erpnext-worker:v13.35.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -139,7 +139,7 @@ services:
       - redis-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.35.2
+    image: frappe/erpnext-worker:v13.35.3
     deploy:
       restart_policy:
         condition: on-failure

From f3101e0a4f81848d3b42631a62398ec82fcb84c1 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 20 Jul 2022 10:30:48 +0000
Subject: [PATCH 16/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 9efbc9f1..3bb58720 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
 
-FRAPPE_VERSION=v13.35.2
+FRAPPE_VERSION=v13.36.0
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v13.35.3
diff --git a/pwd.yml b/pwd.yml
index 6185f272..a7389631 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -150,7 +150,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.35.2
+    image: frappe/frappe-socketio:v13.36.0
     deploy:
       restart_policy:
         condition: on-failure

From 98de31839a9e3a48aafb402f0ee30247f5f36eb7 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 20 Jul 2022 15:36:00 +0000
Subject: [PATCH 17/54] 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 3bb58720..1f19376b 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v13.36.0
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.35.3
+ERPNEXT_VERSION=v13.36.0
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index a7389631..c9a62f54 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.35.3
+    image: frappe/erpnext-worker:v13.36.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.35.3
+    image: frappe/erpnext-worker:v13.36.0
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.35.3
+    image: frappe/erpnext-worker:v13.36.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -74,7 +74,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.35.3
+    image: frappe/erpnext-nginx:v13.36.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -92,7 +92,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.35.3
+    image: frappe/erpnext-worker:v13.36.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -105,7 +105,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.35.3
+    image: frappe/erpnext-worker:v13.36.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -118,7 +118,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.35.3
+    image: frappe/erpnext-worker:v13.36.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -139,7 +139,7 @@ services:
       - redis-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.35.3
+    image: frappe/erpnext-worker:v13.36.0
     deploy:
       restart_policy:
         condition: on-failure

From 07f655e583e1eab2f3fd285cd3b94e2f07cce9ef Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 20 Jul 2022 16:04:19 +0000
Subject: [PATCH 18/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 1f19376b..3dcda7a9 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
 
-FRAPPE_VERSION=v13.36.0
+FRAPPE_VERSION=v13.36.1
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v13.36.0
diff --git a/pwd.yml b/pwd.yml
index c9a62f54..84a9cfac 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -150,7 +150,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.36.0
+    image: frappe/frappe-socketio:v13.36.1
     deploy:
       restart_policy:
         condition: on-failure

From 8a917fec026eecec7e67e40ee8576f2e72c4888d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 06:01:04 +0530
Subject: [PATCH 19/54] chore(deps): Update pre-commit hooks (#854)

Co-authored-by: vrslev <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 8ff2f6e5..09c4d767 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: v2.37.1
+    rev: v2.37.2
     hooks:
       - id: pyupgrade
         args: [--py37-plus]

From 459f2efd8fa3646548b3e70ba8f0a8aaa86ae5cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 06:01:30 +0530
Subject: [PATCH 20/54] chore(deps): bump docker/bake-action from 2.1.0 to
 2.2.0 (#855)

Bumps [docker/bake-action](https://github.com/docker/bake-action) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/docker/bake-action/releases)
- [Commits](https://github.com/docker/bake-action/compare/v2.1.0...v2.2.0)

---
updated-dependencies:
- dependency-name: docker/bake-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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 004c630e..be55b53c 100644
--- a/.github/workflows/build_bench.yml
+++ b/.github/workflows/build_bench.yml
@@ -32,7 +32,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build and test
-        uses: docker/bake-action@v2.1.0
+        uses: docker/bake-action@v2.2.0
         with:
           targets: bench-test
 
@@ -45,7 +45,7 @@ jobs:
 
       - name: Push
         if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-        uses: docker/bake-action@v2.1.0
+        uses: docker/bake-action@v2.2.0
         with:
           targets: bench
           push: true
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 358e1df7..b522aa80 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -43,7 +43,7 @@ jobs:
         run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }}
 
       - name: Build
-        uses: docker/bake-action@v2.1.0
+        uses: docker/bake-action@v2.2.0
         with:
           push: true
         env:
@@ -74,6 +74,6 @@ jobs:
 
       - name: Push
         if: ${{ inputs.push }}
-        uses: docker/bake-action@v2.1.0
+        uses: docker/bake-action@v2.2.0
         with:
           push: true

From dad4b525f50008d5b3f7b95076094201757ab4ef Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 21 Jul 2022 08:13:33 +0000
Subject: [PATCH 21/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 3dcda7a9..9b7d137f 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
 
-FRAPPE_VERSION=v13.36.1
+FRAPPE_VERSION=v13.36.2
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v13.36.0
diff --git a/pwd.yml b/pwd.yml
index 84a9cfac..e0b05386 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -150,7 +150,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.36.1
+    image: frappe/frappe-socketio:v13.36.2
     deploy:
       restart_policy:
         condition: on-failure

From d5a6c09ba720feb8d01a6e8bad187e298c8fe861 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 21 Jul 2022 08:39:51 +0000
Subject: [PATCH 22/54] 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 9b7d137f..8118013b 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v13.36.2
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.36.0
+ERPNEXT_VERSION=v13.36.1
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index e0b05386..2e4dfd26 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.36.0
+    image: frappe/erpnext-worker:v13.36.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.36.0
+    image: frappe/erpnext-worker:v13.36.1
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.36.0
+    image: frappe/erpnext-worker:v13.36.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -74,7 +74,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.36.0
+    image: frappe/erpnext-nginx:v13.36.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -92,7 +92,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.36.0
+    image: frappe/erpnext-worker:v13.36.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -105,7 +105,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.36.0
+    image: frappe/erpnext-worker:v13.36.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -118,7 +118,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.36.0
+    image: frappe/erpnext-worker:v13.36.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -139,7 +139,7 @@ services:
       - redis-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.36.0
+    image: frappe/erpnext-worker:v13.36.1
     deploy:
       restart_policy:
         condition: on-failure

From 95711cc847cd2a56411f141d1769e3003e7a1f3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Jul 2022 17:18:08 +0530
Subject: [PATCH 23/54] chore(deps): bump nginxinc/nginx-unprivileged in
 /images/nginx (#856)

Bumps nginxinc/nginx-unprivileged from 1.23.0-alpine to 1.23.1-alpine.

---
updated-dependencies:
- dependency-name: nginxinc/nginx-unprivileged
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 images/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile
index 22100df6..95c86883 100644
--- a/images/nginx/Dockerfile
+++ b/images/nginx/Dockerfile
@@ -47,7 +47,7 @@ RUN git clone --depth 1 ${BENCH_REPO} /tmp/bench \
     && mv /tmp/bench/bench/config/templates/502.html /out/
 
 
-FROM nginxinc/nginx-unprivileged:1.23.0-alpine as frappe
+FROM nginxinc/nginx-unprivileged:1.23.1-alpine as frappe
 
 # https://github.com/nginxinc/docker-nginx-unprivileged/blob/main/stable/alpine/20-envsubst-on-templates.sh
 COPY nginx-template.conf /etc/nginx/templates/default.conf.template

From c8682e4857d3e03303e2b73904946fb014d372e6 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sun, 24 Jul 2022 11:29:18 +0530
Subject: [PATCH 24/54] fix: use 3 redis services instead of 1 (#859)

* fix: use 3 redis services instead of 1

* fix: waititing for redis
---
 pwd.yml | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/pwd.yml b/pwd.yml
index 2e4dfd26..60579e6b 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -17,9 +17,9 @@ services:
     environment:
       DB_HOST: db
       DB_PORT: "3306"
-      REDIS_CACHE: redis:6379/0
-      REDIS_QUEUE: redis:6379/1
-      REDIS_SOCKETIO: redis:6379/2
+      REDIS_CACHE: redis-cache:6379
+      REDIS_QUEUE: redis-queue:6379
+      REDIS_SOCKETIO: redis-socketio:6379
       SOCKETIO_PORT: "9000"
     volumes:
       - sites:/home/frappe/frappe-bench/sites
@@ -38,7 +38,9 @@ services:
     command:
       - >
         wait-for-it -t 120 db:3306;
-        wait-for-it -t 120 redis:6379;
+        wait-for-it -t 120 redis-cache:6379;
+        wait-for-it -t 120 redis-queue:6379;
+        wait-for-it -t 120 redis-socketio:6379;
         export start=`date +%s`;
         until [[ -n `grep -hs ^ common_site_config.json | jq -r ".db_host // empty"` ]] && \
           [[ -n `grep -hs ^ common_site_config.json | jq -r ".redis_cache // empty"` ]] && \
@@ -130,13 +132,29 @@ services:
     volumes:
       - sites:/home/frappe/frappe-bench/sites
 
-  redis:
+  redis-queue:
     image: redis:6.2-alpine
     deploy:
       restart_policy:
         condition: on-failure
     volumes:
-      - redis-data:/data
+      - redis-queue-data:/data
+
+  redis-cache:
+    image: redis:6.2-alpine
+    deploy:
+      restart_policy:
+        condition: on-failure
+    volumes:
+      - redis-cache-data:/data
+
+  redis-socketio:
+    image: redis:6.2-alpine
+    deploy:
+      restart_policy:
+        condition: on-failure
+    volumes:
+      - redis-socketio-data:/data
 
   scheduler:
     image: frappe/erpnext-worker:v13.36.1
@@ -160,5 +178,7 @@ services:
 volumes:
   assets:
   db-data:
-  redis-data:
+  redis-queue-data:
+  redis-cache-data:
+  redis-socketio-data:
   sites:

From e19574dcdf8fcdf985978f6ec35d337a26c37108 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 27 Jul 2022 12:35:10 +0530
Subject: [PATCH 25/54] chore(deps): Update pre-commit hooks (#861)

Co-authored-by: vrslev <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 09c4d767..188686b3 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: v2.37.2
+    rev: v2.37.3
     hooks:
       - id: pyupgrade
         args: [--py37-plus]

From b1e5bb73798053f169151a694ae1510c2d7a6d97 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 28 Jul 2022 08:03:45 +0000
Subject: [PATCH 26/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 8118013b..44fdab2b 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
 
-FRAPPE_VERSION=v13.36.2
+FRAPPE_VERSION=v13.36.3
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v13.36.1
diff --git a/pwd.yml b/pwd.yml
index 60579e6b..1947a01f 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.36.2
+    image: frappe/frappe-socketio:v13.36.3
     deploy:
       restart_policy:
         condition: on-failure

From d6acb0851b3666233212bfa04a7c3a02c0017160 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 28 Jul 2022 12:27:53 +0000
Subject: [PATCH 27/54] 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 44fdab2b..d510f6b9 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v13.36.3
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.36.1
+ERPNEXT_VERSION=v13.36.2
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 1947a01f..59ee7687 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.36.1
+    image: frappe/erpnext-worker:v13.36.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.36.1
+    image: frappe/erpnext-worker:v13.36.2
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.36.1
+    image: frappe/erpnext-worker:v13.36.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -76,7 +76,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.36.1
+    image: frappe/erpnext-nginx:v13.36.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -94,7 +94,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.36.1
+    image: frappe/erpnext-worker:v13.36.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -107,7 +107,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.36.1
+    image: frappe/erpnext-worker:v13.36.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -120,7 +120,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.36.1
+    image: frappe/erpnext-worker:v13.36.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -157,7 +157,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.36.1
+    image: frappe/erpnext-worker:v13.36.2
     deploy:
       restart_policy:
         condition: on-failure

From 5c74ff9407620741448b14b8c00f546d1c19bd83 Mon Sep 17 00:00:00 2001
From: Talbi Youssef <58428792+krank56@users.noreply.github.com>
Date: Thu, 28 Jul 2022 14:09:29 +0100
Subject: [PATCH 28/54] First instead of second Typo (#862)

---
 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 96c44032..e125d2d3 100644
--- a/docs/single-server-example.md
+++ b/docs/single-server-example.md
@@ -129,7 +129,7 @@ This will make `mariadb-database` service available under `mariadb-network`. Dat
 
 #### Create first bench
 
-Create second bench called `erpnext-one` with `one.example.com` and `two.example.com`
+Create first bench called `erpnext-one` with `one.example.com` and `two.example.com`
 
 Create a file called `erpnext-one.env` in `~/gitops`
 

From 6fa946a6309bd4bd5cc1fde99f1bc34d04f22626 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Tue, 2 Aug 2022 06:01:13 +0530
Subject: [PATCH 29/54] fix: install frappe/payments for v14 and develop (#867)

* fix: install frappe/payments for v14 and develop

* fix: test installs payments as per version

* fix: copy all apps for erpnext images

* fix: test installs payments on version-14

* fix: get_latest_tags script

* fix: docker build condition for v14
---
 .github/scripts/get_latest_tags.py |  2 ++
 images/nginx/Dockerfile            |  7 ++++++-
 images/worker/Dockerfile           | 10 +++++++---
 tests/conftest.py                  | 11 +++++++++--
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/get_latest_tags.py b/.github/scripts/get_latest_tags.py
index c1f2cdc5..b2e083c4 100644
--- a/.github/scripts/get_latest_tags.py
+++ b/.github/scripts/get_latest_tags.py
@@ -19,6 +19,8 @@ def get_latest_tag(repo: Repo, version: MajorVersion) -> str:
     refs = subprocess.check_output(
         (
             "git",
+            "-c",
+            "versionsort.suffix=-",
             "ls-remote",
             "--refs",
             "--tags",
diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile
index 95c86883..eb4da5cc 100644
--- a/images/nginx/Dockerfile
+++ b/images/nginx/Dockerfile
@@ -32,9 +32,14 @@ RUN install-app frappe
 
 FROM assets_builder as erpnext_assets
 
+ARG PAYMENTS_VERSION=develop
+ARG PAYMENTS_REPO=https://github.com/frappe/payments
 ARG ERPNEXT_VERSION
 ARG ERPNEXT_REPO=https://github.com/frappe/erpnext
-RUN git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \
+RUN if [ -z "${ERPNEXT_VERSION##*v14*}" ] || [ "$ERPNEXT_VERSION" = "develop" ]; then \
+        git clone --depth 1 -b ${PAYMENTS_VERSION} ${PAYMENTS_REPO} apps/payments && install-app payments; \
+    fi \
+    && git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \
     && install-app erpnext
 
 
diff --git a/images/worker/Dockerfile b/images/worker/Dockerfile
index 77fb2588..40c09945 100644
--- a/images/worker/Dockerfile
+++ b/images/worker/Dockerfile
@@ -54,10 +54,15 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 
 FROM frappe_builder as erpnext_builder
 
+ARG PAYMENTS_VERSION=develop
+ARG PAYMENTS_REPO=https://github.com/frappe/payments
 ARG ERPNEXT_VERSION
 ARG ERPNEXT_REPO=https://github.com/frappe/erpnext
 RUN --mount=type=cache,target=/root/.cache/pip \
-    git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \
+    if [ -z "${ERPNEXT_VERSION##*v14*}" ] || [ "$ERPNEXT_VERSION" = "develop" ]; then \
+        git clone --depth 1 -b ${PAYMENTS_VERSION} ${PAYMENTS_REPO} apps/payments && install-app payments; \
+    fi \
+    && git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \
     && install-app erpnext
 
 
@@ -122,8 +127,7 @@ USER frappe
 # Split frappe and erpnext to reduce image size (because of frappe-bench/env/ directory)
 FROM configured_base as erpnext
 
-COPY --from=frappe_builder /home/frappe/frappe-bench/apps/frappe /home/frappe/frappe-bench/apps/frappe
-COPY --from=erpnext_builder /home/frappe/frappe-bench/apps/erpnext /home/frappe/frappe-bench/apps/erpnext
+COPY --from=erpnext_builder /home/frappe/frappe-bench/apps /home/frappe/frappe-bench/apps
 COPY --from=erpnext_builder /home/frappe/frappe-bench/env /home/frappe/frappe-bench/env
 COPY --from=erpnext_builder /home/frappe/frappe-bench/sites/apps.txt /home/frappe/frappe-bench/sites/
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 2b531f33..f9885dd1 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -81,7 +81,7 @@ def erpnext_setup(compose: Compose):
 @pytest.fixture(scope="class")
 def erpnext_site(compose: Compose):
     site_name = "test_erpnext_site"
-    compose.bench(
+    args = [
         "new-site",
         site_name,
         "--mariadb-root-password",
@@ -90,7 +90,14 @@ def erpnext_site(compose: Compose):
         "admin",
         "--install-app",
         "erpnext",
-    )
+    ]
+    erpnext_version = os.environ.get("ERPNEXT_VERSION")
+    if erpnext_version in [
+        "develop",
+        "version-14",
+    ] or erpnext_version.startswith("v14"):
+        args.append("--install-app=payments")
+    compose.bench(*args)
     compose("restart", "backend")
     yield site_name
 

From 67026915dd9130df952ed1aef3f169b0de83a636 Mon Sep 17 00:00:00 2001
From: Pazdo <filippazdic@gmail.com>
Date: Tue, 2 Aug 2022 11:30:49 +0200
Subject: [PATCH 30/54] Fix for multiple simultaneous running stacks (#857)

* Add files via upload

* Updated networks

* Updated networks
---
 docs/compose/compose.multi-bench.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/compose/compose.multi-bench.yaml b/docs/compose/compose.multi-bench.yaml
index 17145c65..b83567b3 100644
--- a/docs/compose/compose.multi-bench.yaml
+++ b/docs/compose/compose.multi-bench.yaml
@@ -2,7 +2,6 @@ services:
   frontend:
     networks:
       - traefik-public
-      - mariadb-network
       - bench-network
     labels:
       - traefik.enable=true
@@ -13,27 +12,34 @@ services:
       - traefik.http.routers.${ROUTER}-http.rule=Host(${SITES?SITES not set})
   configurator:
     networks:
+      - bench-network
       - mariadb-network
   backend:
     networks:
       - mariadb-network
+      - bench-network
   websocket:
     networks:
+      - bench-network
       - mariadb-network
   scheduler:
     networks:
+      - bench-network
       - mariadb-network
   queue-default:
     networks:
+      - bench-network
       - mariadb-network
   queue-short:
     networks:
-      - mariadb-network
+      - bench-network
   queue-long:
     networks:
+      - bench-network
       - mariadb-network
   redis:
     networks:
+      - bench-network
       - mariadb-network
 
 networks:

From a20dd916d22492e770d3cd67dccd82af7211ac2e Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Wed, 3 Aug 2022 12:23:32 +0530
Subject: [PATCH 31/54] update: use v14 instead of v13 (#871)

---
 .github/workflows/build_stable.yml |  8 ++++----
 docs/backup-and-push-cronjob.md    |  2 +-
 example.env                        |  4 ++--
 pwd.yml                            | 20 ++++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
index 3f62bfc0..d11cc87e 100644
--- a/.github/workflows/build_stable.yml
+++ b/.github/workflows/build_stable.yml
@@ -68,7 +68,7 @@ jobs:
     name: Update example.env and pwd.yml
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-    needs: v13
+    needs: v14
 
     steps:
       - name: Checkout
@@ -80,7 +80,7 @@ jobs:
           python-version: "3.10"
 
       - name: Get latest versions
-        run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 13
+        run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 14
 
       - name: Update
         run: |
@@ -106,7 +106,7 @@ jobs:
     name: Release Helm
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-    needs: v13
+    needs: v14
 
     steps:
       - name: Setup deploy key
@@ -123,4 +123,4 @@ jobs:
         run: |
           git clone git@github.com:frappe/helm.git && cd helm
           pip install -r release_wizard/requirements.txt
-          ./release_wizard/wizard 13 patch --remote origin --ci
+          ./release_wizard/wizard 14 patch --remote origin --ci
diff --git a/docs/backup-and-push-cronjob.md b/docs/backup-and-push-cronjob.md
index 745758fd..c6051ff8 100644
--- a/docs/backup-and-push-cronjob.md
+++ b/docs/backup-and-push-cronjob.md
@@ -5,7 +5,7 @@ Create backup service or stack.
 version: "3.7"
 services:
   backup:
-    image: frappe/erpnext-worker:v13
+    image: frappe/erpnext-worker:v14
     entrypoint: ["bash", "-c"]
     command: |
       for SITE in $(/home/frappe/frappe-bench/env/bin/python -c "import frappe;print(' '.join(frappe.utils.get_sites()))")
diff --git a/example.env b/example.env
index d510f6b9..ad4e4f11 100644
--- a/example.env
+++ b/example.env
@@ -1,9 +1,9 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-FRAPPE_VERSION=v13.36.3
+FRAPPE_VERSION=v14.0.0
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v13.36.2
+ERPNEXT_VERSION=v14.0.0
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 59ee7687..cff1072c 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.36.2
+    image: frappe/erpnext-worker:v14.0.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.36.2
+    image: frappe/erpnext-worker:v14.0.0
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.36.2
+    image: frappe/erpnext-worker:v14.0.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -54,7 +54,7 @@ services:
           fi
         done;
         echo "common_site_config.json found";
-        bench new-site frontend --admin-password=admin --db-root-password=admin --install-app erpnext --set-default;
+        bench new-site frontend --admin-password=admin --db-root-password=admin --install-app payments --install-app erpnext --set-default;
 
   db:
     image: mariadb:10.6
@@ -76,7 +76,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.36.2
+    image: frappe/erpnext-nginx:v14.0.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -94,7 +94,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.36.2
+    image: frappe/erpnext-worker:v14.0.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -107,7 +107,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.36.2
+    image: frappe/erpnext-worker:v14.0.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -120,7 +120,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.36.2
+    image: frappe/erpnext-worker:v14.0.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -157,7 +157,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.36.2
+    image: frappe/erpnext-worker:v14.0.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.36.3
+    image: frappe/frappe-socketio:v14.0.0
     deploy:
       restart_policy:
         condition: on-failure

From c615b1c4bbda4d753fed2114e63f137db2202541 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 3 Aug 2022 10:53:47 +0000
Subject: [PATCH 32/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index ad4e4f11..fb981bd0 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
 
-FRAPPE_VERSION=v14.0.0
+FRAPPE_VERSION=v14.0.2
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.0
diff --git a/pwd.yml b/pwd.yml
index cff1072c..bb391bba 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.0.0
+    image: frappe/frappe-socketio:v14.0.2
     deploy:
       restart_policy:
         condition: on-failure

From 0bc44cfcdfd78451195b4eb5db784103e9eb6566 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 11 Aug 2022 13:32:04 +0000
Subject: [PATCH 33/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index fb981bd0..51ef45f7 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
 
-FRAPPE_VERSION=v14.0.2
+FRAPPE_VERSION=v14.1.0
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.0
diff --git a/pwd.yml b/pwd.yml
index bb391bba..d4909147 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.0.2
+    image: frappe/frappe-socketio:v14.1.0
     deploy:
       restart_policy:
         condition: on-failure

From d97ee7add88d3bd7f5ba14e191296b127295dde8 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Sat, 13 Aug 2022 09:50:01 +0000
Subject: [PATCH 34/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 51ef45f7..a18c7fa6 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
 
-FRAPPE_VERSION=v14.1.0
+FRAPPE_VERSION=v14.2.0
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.0
diff --git a/pwd.yml b/pwd.yml
index d4909147..eb223ad3 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.1.0
+    image: frappe/frappe-socketio:v14.2.0
     deploy:
       restart_policy:
         condition: on-failure

From 65c8623e466e2785a7e16d54b567951ad1402217 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 17 Aug 2022 14:28:34 +0000
Subject: [PATCH 35/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index a18c7fa6..6fe9eae8 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
 
-FRAPPE_VERSION=v14.2.0
+FRAPPE_VERSION=v14.3.0
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.0
diff --git a/pwd.yml b/pwd.yml
index eb223ad3..1f74bca4 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.2.0
+    image: frappe/frappe-socketio:v14.3.0
     deploy:
       restart_policy:
         condition: on-failure

From 1358ce839c0107b04dd3a491d27a21e75897f268 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 18 Aug 2022 08:46:39 +0000
Subject: [PATCH 36/54] 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 6fe9eae8..0e83517d 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v14.3.0
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v14.0.0
+ERPNEXT_VERSION=v14.0.1
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 1f74bca4..a29391d7 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v14.0.0
+    image: frappe/erpnext-worker:v14.0.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v14.0.0
+    image: frappe/erpnext-worker:v14.0.1
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v14.0.0
+    image: frappe/erpnext-worker:v14.0.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -76,7 +76,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v14.0.0
+    image: frappe/erpnext-nginx:v14.0.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -94,7 +94,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v14.0.0
+    image: frappe/erpnext-worker:v14.0.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -107,7 +107,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v14.0.0
+    image: frappe/erpnext-worker:v14.0.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -120,7 +120,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v14.0.0
+    image: frappe/erpnext-worker:v14.0.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -157,7 +157,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v14.0.0
+    image: frappe/erpnext-worker:v14.0.1
     deploy:
       restart_policy:
         condition: on-failure

From 17d2baac1b772590cc16638cbd545950972ffe79 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 19 Aug 2022 10:16:10 +0530
Subject: [PATCH 37/54] chore(deps): Update pre-commit hooks (#877)

Co-authored-by: vrslev <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 188686b3..709a9d78 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.1.0
+    rev: v2.2.0
     hooks:
       - id: codespell
 

From 76dce27cf2d8ee9d195bbd2e5b0f426dc2258640 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Fri, 19 Aug 2022 12:08:32 +0530
Subject: [PATCH 38/54] fix assets mount (#880)

* fix: mount assets on workers

fix #844

* fix: add codespell allowed word ro
---
 .pre-commit-config.yaml | 3 +++
 compose.yaml            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 709a9d78..3c2101d2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -32,6 +32,9 @@ repos:
     rev: v2.2.0
     hooks:
       - id: codespell
+        args:
+          - -L
+          - "ro"
 
   - repo: local
     hooks:
diff --git a/compose.yaml b/compose.yaml
index 2916c38e..95ea1f40 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -8,6 +8,7 @@ x-backend-defaults: &backend_defaults
   image: frappe/frappe-worker:${FRAPPE_VERSION:?No Frappe version set}
   volumes:
     - sites:/home/frappe/frappe-bench/sites
+    - assets:/home/frappe/frappe-bench/sites/assets
 
 services:
   configurator:

From bcfd470e337d4383a064d9fb7b4df98e70203299 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Fri, 19 Aug 2022 13:59:41 +0530
Subject: [PATCH 39/54] chore(deps): Update pre-commit hooks (#883)

---
 .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 3c2101d2..d1b915e9 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.0
+    rev: v2.2.1
     hooks:
       - id: codespell
         args:

From 019316b0e5443d14b1c04e43cbf9167c3aa67d7c Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 19 Aug 2022 15:10:47 +0000
Subject: [PATCH 40/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 0e83517d..364adbab 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
 
-FRAPPE_VERSION=v14.3.0
+FRAPPE_VERSION=v14.4.0
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.1
diff --git a/pwd.yml b/pwd.yml
index a29391d7..4522be35 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.3.0
+    image: frappe/frappe-socketio:v14.4.0
     deploy:
       restart_policy:
         condition: on-failure

From defcf83e37597b83084a8591a82476bced96e465 Mon Sep 17 00:00:00 2001
From: Salah Aldin Fateh <83924106+sdfateh@users.noreply.github.com>
Date: Mon, 22 Aug 2022 09:50:02 +0300
Subject: [PATCH 41/54] edits on volumes definition  (#886)

* Update compose.yaml

Delete the unnecessary volume definition and add read only to assets on backend

* Update compose.yaml

Delete the unnecessary volume definition and add read-only to assets on the backend
---
 compose.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 95ea1f40..97c4d1d8 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -8,7 +8,7 @@ x-backend-defaults: &backend_defaults
   image: frappe/frappe-worker:${FRAPPE_VERSION:?No Frappe version set}
   volumes:
     - sites:/home/frappe/frappe-bench/sites
-    - assets:/home/frappe/frappe-bench/sites/assets
+    - assets:/home/frappe/frappe-bench/sites/assets:ro
 
 services:
   configurator:
@@ -25,9 +25,6 @@ services:
 
   backend:
     <<: *backend_defaults
-    volumes:
-      - sites:/home/frappe/frappe-bench/sites
-      - assets:/home/frappe/frappe-bench/sites/assets:ro
 
   frontend:
     image: frappe/frappe-nginx:${FRAPPE_VERSION}

From f2790c8a36313988661ceaa8fd5ef6866aa4df06 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 23 Aug 2022 04:21:07 +0000
Subject: [PATCH 42/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 364adbab..65b9f8e1 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
 
-FRAPPE_VERSION=v14.4.0
+FRAPPE_VERSION=v14.4.1
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.1
diff --git a/pwd.yml b/pwd.yml
index 4522be35..4c81e317 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.4.0
+    image: frappe/frappe-socketio:v14.4.1
     deploy:
       restart_policy:
         condition: on-failure

From b853d9e6bfae8ef5cf79914de9398c61961ad41c Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 23 Aug 2022 05:41:03 +0000
Subject: [PATCH 43/54] 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 65b9f8e1..ce498e37 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v14.4.1
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v14.0.1
+ERPNEXT_VERSION=v14.0.2
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 4c81e317..c201cc6f 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v14.0.1
+    image: frappe/erpnext-worker:v14.0.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v14.0.1
+    image: frappe/erpnext-worker:v14.0.2
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v14.0.1
+    image: frappe/erpnext-worker:v14.0.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -76,7 +76,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v14.0.1
+    image: frappe/erpnext-nginx:v14.0.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -94,7 +94,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v14.0.1
+    image: frappe/erpnext-worker:v14.0.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -107,7 +107,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v14.0.1
+    image: frappe/erpnext-worker:v14.0.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -120,7 +120,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v14.0.1
+    image: frappe/erpnext-worker:v14.0.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -157,7 +157,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v14.0.1
+    image: frappe/erpnext-worker:v14.0.2
     deploy:
       restart_policy:
         condition: on-failure

From ea62cba30058ba24b27e4460a01cfa33d5b98427 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 24 Aug 2022 06:30:02 +0000
Subject: [PATCH 44/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index ce498e37..8a6feaa9 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
 
-FRAPPE_VERSION=v14.4.1
+FRAPPE_VERSION=v14.4.2
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.2
diff --git a/pwd.yml b/pwd.yml
index c201cc6f..310c8b04 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.4.1
+    image: frappe/frappe-socketio:v14.4.2
     deploy:
       restart_policy:
         condition: on-failure

From 399def488e2e68e1d011d4802bfa3e37f6ba3cd5 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 26 Aug 2022 09:04:23 +0000
Subject: [PATCH 45/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 8a6feaa9..cf1bda81 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
 
-FRAPPE_VERSION=v14.4.2
+FRAPPE_VERSION=v14.4.3
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.2
diff --git a/pwd.yml b/pwd.yml
index 310c8b04..2a6e803f 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.4.2
+    image: frappe/frappe-socketio:v14.4.3
     deploy:
       restart_policy:
         condition: on-failure

From 7e5d9c7f53b764550db0a88b5cb068c12ad3dad7 Mon Sep 17 00:00:00 2001
From: HENRY Florian <florian.henry@open-concept.pro>
Date: Tue, 30 Aug 2022 09:10:33 +0200
Subject: [PATCH 46/54] feat: remove version-12 dependencies (#898)

* feat: remove version-12 dependencies

* chore: Add in comment missing depdencies

* chore: Add in comment missing depdencies

* chore: Add in comment missing depdencies
---
 images/bench/Dockerfile | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile
index 5c63a72d..e3ee3d3d 100644
--- a/images/bench/Dockerfile
+++ b/images/bench/Dockerfile
@@ -13,9 +13,6 @@ RUN apt-get update \
     postgresql-client \
     gettext-base \
     wget \
-    # for ERPNext v12
-    # TODO: Remove after v12 is deprecated
-    python2 \
     # for PDF
     libssl-dev \
     fonts-cantarell \
@@ -51,6 +48,21 @@ RUN apt-get update \
     ssh-client \
     # VSCode container requirements
     net-tools \
+    # Uncomment for python depencies
+    #make \
+    ## For pandas
+    #libbz2-dev \
+    ## For bench execute
+    #libsqlite3-dev \
+    ## For other dependencies
+    #zlib1g-dev \
+    #libreadline-dev \
+    #llvm \
+    #libncurses5-dev \
+    #libncursesw5-dev \
+    #xz-utils \
+    #tk-dev \
+    #liblzma-dev \
     && 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 \
@@ -76,9 +88,6 @@ USER frappe
 WORKDIR /home/frappe
 
 # Install Python via pyenv
-# Python 3.7 sits here for ERPNext version-12
-# TODO: Remove Python 3.7 when version-12 will not be supported
-ENV PYTHON_VERSION_V12=3.7.12
 ENV PYTHON_VERSION_V13=3.9.9
 ENV PYTHON_VERSION=3.10.5
 ENV PYENV_ROOT /home/frappe/.pyenv
@@ -86,10 +95,9 @@ ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 
 # From https://github.com/pyenv/pyenv#basic-github-checkout
 RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \
-    && pyenv install $PYTHON_VERSION_V12 \
     && pyenv install $PYTHON_VERSION_V13 \
     && pyenv install $PYTHON_VERSION \
-    && pyenv global $PYTHON_VERSION $PYTHON_VERSION_V12 $PYTHON_VERSION_v13 \
+    && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v13 \
     && sed -Ei -e '/^([^#]|$)/ {a export PYENV_ROOT="/home/frappe/.pyenv" a export PATH="$PYENV_ROOT/bin:$PATH" a ' -e ':a' -e '$!{n;ba};}' ~/.profile \
     && echo 'eval "$(pyenv init --path)"' >>~/.profile \
     && echo 'eval "$(pyenv init -)"' >>~/.bashrc
@@ -106,14 +114,11 @@ RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \
 
 # Install Node via nvm
 ENV NODE_VERSION=14.18.1
-ENV NODE_VERSION_FRAPPEV11=10.24.1
 ENV NVM_DIR /home/frappe/.nvm
 ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
 
 RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \
     && . ${NVM_DIR}/nvm.sh \
-    && nvm install ${NODE_VERSION_FRAPPEV11} \
-    && nvm use v${NODE_VERSION_FRAPPEV11} \
     && npm install -g yarn \
     && nvm install ${NODE_VERSION} \
     && nvm use v${NODE_VERSION} \

From f60ed87ec8d48b7a5a7e972ebec0dfbf7be78e0c Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 30 Aug 2022 07:56:06 +0000
Subject: [PATCH 47/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index cf1bda81..4323475d 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
 
-FRAPPE_VERSION=v14.4.3
+FRAPPE_VERSION=v14.5.0
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.2
diff --git a/pwd.yml b/pwd.yml
index 2a6e803f..906643a1 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.4.3
+    image: frappe/frappe-socketio:v14.5.0
     deploy:
       restart_policy:
         condition: on-failure

From 8065487c92d47f9ef298772cf935f8a2c4f63026 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 30 Aug 2022 09:39:06 +0000
Subject: [PATCH 48/54] 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 4323475d..5a475453 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v14.5.0
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v14.0.2
+ERPNEXT_VERSION=v14.0.3
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 906643a1..39e58dce 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext-worker:v14.0.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext-worker:v14.0.3
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext-worker:v14.0.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -76,7 +76,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v14.0.2
+    image: frappe/erpnext-nginx:v14.0.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -94,7 +94,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext-worker:v14.0.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -107,7 +107,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext-worker:v14.0.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -120,7 +120,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext-worker:v14.0.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -157,7 +157,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext-worker:v14.0.3
     deploy:
       restart_policy:
         condition: on-failure

From 2cb93e73155df2f45d98675890aeaaadb18deaa0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 16:26:17 +0530
Subject: [PATCH 49/54] chore(deps-dev): bump black from 22.6.0 to 22.8.0
 (#909)

Bumps [black](https://github.com/psf/black) from 22.6.0 to 22.8.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.6.0...22.8.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index cd9dbbbd..10e75138 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,3 @@
 frappe @ git+https://github.com/frappe/frappe.git
 boto3-stubs[s3]
-black==22.6.0
+black==22.8.0

From 7ebd7d62b9069f683402de7452d5d64fd4e68ba1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Sep 2022 10:06:35 +0530
Subject: [PATCH 50/54] chore(deps): bump pytest from 7.1.2 to 7.1.3 (#914)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.2 to 7.1.3.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.1.2...7.1.3)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
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 d00689e0..e0716850 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1 +1 @@
-pytest==7.1.2
+pytest==7.1.3

From 7fac6f3190a561a9d113c1872f1f5eefe4286644 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Tue, 6 Sep 2022 12:10:52 +0530
Subject: [PATCH 51/54] chore(deps): Update pre-commit hooks (#916)

---
 .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 d1b915e9..34eb3b62 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: 22.6.0
+    rev: 22.8.0
     hooks:
       - id: black
 

From 61c8de5c082f10cc92b00833a8b4a9b30a2ea059 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 6 Sep 2022 11:16:47 +0000
Subject: [PATCH 52/54] chore: Update example.env

---
 example.env | 2 +-
 pwd.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.env b/example.env
index 5a475453..7ee4e5fd 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
 
-FRAPPE_VERSION=v14.5.0
+FRAPPE_VERSION=v14.6.0
 
 # Only with ERPNext override
 ERPNEXT_VERSION=v14.0.3
diff --git a/pwd.yml b/pwd.yml
index 39e58dce..23b19295 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -168,7 +168,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v14.5.0
+    image: frappe/frappe-socketio:v14.6.0
     deploy:
       restart_policy:
         condition: on-failure

From 81ea33d56eb0ddab4bc652b72c0290d8cac4044d Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 6 Sep 2022 16:16:36 +0000
Subject: [PATCH 53/54] 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 7ee4e5fd..969cc19a 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@
 FRAPPE_VERSION=v14.6.0
 
 # Only with ERPNext override
-ERPNEXT_VERSION=v14.0.3
+ERPNEXT_VERSION=v14.1.0
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 23b19295..e6dd5cfe 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v14.0.3
+    image: frappe/erpnext-worker:v14.1.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v14.0.3
+    image: frappe/erpnext-worker:v14.1.0
     command:
       - configure.py
     environment:
@@ -25,7 +25,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v14.0.3
+    image: frappe/erpnext-worker:v14.1.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -76,7 +76,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v14.0.3
+    image: frappe/erpnext-nginx:v14.1.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -94,7 +94,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v14.0.3
+    image: frappe/erpnext-worker:v14.1.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -107,7 +107,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v14.0.3
+    image: frappe/erpnext-worker:v14.1.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -120,7 +120,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v14.0.3
+    image: frappe/erpnext-worker:v14.1.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -157,7 +157,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v14.0.3
+    image: frappe/erpnext-worker:v14.1.0
     deploy:
       restart_policy:
         condition: on-failure

From 2c1e5425b6099321816b21e49bf35e3707552b6b Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Fri, 9 Sep 2022 15:48:22 +0530
Subject: [PATCH 54/54] fix(bench): add dependencies to build python using
 pyenv (#920)

* fix(bench): add dependencies to build python using pyenv

fixes #840

* fix(bench): comment typo
---
 images/bench/Dockerfile | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile
index e3ee3d3d..49de9d97 100644
--- a/images/bench/Dockerfile
+++ b/images/bench/Dockerfile
@@ -48,21 +48,22 @@ RUN apt-get update \
     ssh-client \
     # VSCode container requirements
     net-tools \
-    # Uncomment for python depencies
-    #make \
-    ## For pandas
-    #libbz2-dev \
-    ## For bench execute
-    #libsqlite3-dev \
-    ## For other dependencies
-    #zlib1g-dev \
-    #libreadline-dev \
-    #llvm \
-    #libncurses5-dev \
-    #libncursesw5-dev \
-    #xz-utils \
-    #tk-dev \
-    #liblzma-dev \
+    # For pyenv build dependencies
+    # https://github.com/frappe/frappe_docker/issues/840#issuecomment-1185206895
+    make \
+    # For pandas
+    libbz2-dev \
+    # For bench execute
+    libsqlite3-dev \
+    # For other dependencies
+    zlib1g-dev \
+    libreadline-dev \
+    llvm \
+    libncurses5-dev \
+    libncursesw5-dev \
+    xz-utils \
+    tk-dev \
+    liblzma-dev \
     && 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 \