From 34b11881755d8890070943bd691aec5fe25a1451 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 5 Jul 2023 16:35:32 +0000
Subject: [PATCH 01/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 68b88b54..da12def8 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.29.0
+ERPNEXT_VERSION=v14.29.1
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 334165a4..fc79aa86 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.29.0
+    image: frappe/erpnext:v14.29.1
     deploy:
       restart_policy:
         condition: on-failure

From 69fbc2ed91a24a2e8c6324314260807533a818f9 Mon Sep 17 00:00:00 2001
From: Antony-M1 <96291963+Antony-M1@users.noreply.github.com>
Date: Thu, 6 Jul 2023 05:30:14 +0530
Subject: [PATCH 02/32] Update development.md (#1168)

---
 docs/development.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development.md b/docs/development.md
index 19060abb..460d5df9 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -82,7 +82,7 @@ To setup frappe framework version 14 bench set `PYENV_VERSION` environment varia
 bench init --skip-redis-config-generation --frappe-branch version-14 frappe-bench
 # Or set environment versions explicitly
 nvm use v16
-PYENV_VERSION=3.10.5 bench init --skip-redis-config-generation --frappe-branch version-14 frappe-bench
+PYENV_VERSION=3.10.12 bench init --skip-redis-config-generation --frappe-branch version-14 frappe-bench
 # Switch directory
 cd frappe-bench
 ```

From a90d435e61e61e68c5e928c827b1de382b7e77b2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 9 Jul 2023 14:56:46 +0530
Subject: [PATCH 03/32] chore(deps): Update pre-commit hooks (#1173)

Co-authored-by: vrslev <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 a6cc7590..283774a5 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.8.0
+    rev: v3.9.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
@@ -24,7 +24,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.9-for-vscode
+    rev: v3.0.0
     hooks:
       - id: prettier
 

From 52296380f19c16981bd87233e522d99e6a4ca663 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Mon, 10 Jul 2023 14:22:25 +0000
Subject: [PATCH 04/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index da12def8..c0ad31ee 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.29.1
+ERPNEXT_VERSION=v14.29.2
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index fc79aa86..faf782f3 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.29.1
+    image: frappe/erpnext:v14.29.2
     deploy:
       restart_policy:
         condition: on-failure

From d60e32bce7827407f4eb201a950b4c69e38a8d93 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:34:28 +0530
Subject: [PATCH 05/32] chore(deps): Update pre-commit hooks (#1177)

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 283774a5..79663e3f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
         args: [--py37-plus]
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
 

From d5aae2097dfdc007bd7260201f85e2351ac95826 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Tue, 11 Jul 2023 17:18:11 +0530
Subject: [PATCH 06/32] fix: use python for installer script (#1178)

---
 .gitignore                    |   2 +-
 development/apps-example.json |  21 +---
 development/installer.py      | 201 ++++++++++++++++++++++++++++++++++
 development/installer.sh      | 160 ---------------------------
 docs/development.md           |  39 ++++---
 5 files changed, 233 insertions(+), 190 deletions(-)
 create mode 100755 development/installer.py
 delete mode 100755 development/installer.sh

diff --git a/.gitignore b/.gitignore
index 9e4c46f9..61803ea8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ sites
 
 development/*
 !development/README.md
-!development/installer.sh
+!development/installer.py
 !development/apps-example.json
 !development/vscode-example/
 
diff --git a/development/apps-example.json b/development/apps-example.json
index 664efd69..f73d9278 100644
--- a/development/apps-example.json
+++ b/development/apps-example.json
@@ -1,15 +1,6 @@
-{
-  "client_name": [
-    {
-      "name": "frappe",
-      "branch": "develop",
-      "upstream": "git@github.com:frappe/frappe.git",
-      "fork": "[your fork]"
-    },
-    {
-      "name": "erpnext",
-      "branch": "develop",
-      "upstream": "git@github.com:frappe/erpnext.git"
-    }
-  ]
-}
+[
+  {
+    "url": "https://github.com/frappe/erpnext.git",
+    "branch": "version-14"
+  }
+]
diff --git a/development/installer.py b/development/installer.py
new file mode 100755
index 00000000..ad5d52c5
--- /dev/null
+++ b/development/installer.py
@@ -0,0 +1,201 @@
+#!/usr/bin/env python3
+import argparse
+import os
+import subprocess
+
+
+def cprint(*args, level: int = 1):
+    """
+    logs colorful messages
+    level = 1 : RED
+    level = 2 : GREEN
+    level = 3 : YELLOW
+
+    default level = 1
+    """
+    CRED = "\033[31m"
+    CGRN = "\33[92m"
+    CYLW = "\33[93m"
+    reset = "\033[0m"
+    message = " ".join(map(str, args))
+    if level == 1:
+        print(CRED, message, reset)  # noqa: T001, T201
+    if level == 2:
+        print(CGRN, message, reset)  # noqa: T001, T201
+    if level == 3:
+        print(CYLW, message, reset)  # noqa: T001, T201
+
+
+def main():
+    parser = get_args_parser()
+    args = parser.parse_args()
+    init_bench_if_not_exist(args)
+    create_site_in_bench(args)
+
+
+def get_args_parser():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-j",
+        "--apps-json",
+        action="store",
+        type=str,
+        help="Path to apps.json, default: apps-example.json",
+        default="apps-example.json",
+    )  # noqa: E501
+    parser.add_argument(
+        "-b",
+        "--bench-name",
+        action="store",
+        type=str,
+        help="Bench directory name, default: frappe-bench",
+        default="frappe-bench",
+    )  # noqa: E501
+    parser.add_argument(
+        "-s",
+        "--site-name",
+        action="store",
+        type=str,
+        help="Site name, should end with .localhost, default: development.localhost",  # noqa: E501
+        default="development.localhost",
+    )
+    parser.add_argument(
+        "-r",
+        "--frappe-repo",
+        action="store",
+        type=str,
+        help="frappe repo to use, default: https://github.com/frappe/frappe",  # noqa: E501
+        default="https://github.com/frappe/frappe",
+    )
+    parser.add_argument(
+        "-t",
+        "--frappe-branch",
+        action="store",
+        type=str,
+        help="frappe repo to use, default: version-14",  # noqa: E501
+        default="version-14",
+    )
+    parser.add_argument(
+        "-p",
+        "--py-version",
+        action="store",
+        type=str,
+        help="python version, default: Not Set",  # noqa: E501
+        default=None,
+    )
+    parser.add_argument(
+        "-n",
+        "--node-version",
+        action="store",
+        type=str,
+        help="node version, default: Not Set",  # noqa: E501
+        default=None,
+    )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        help="verbose output",  # noqa: E501
+    )
+    return parser
+
+
+def init_bench_if_not_exist(args):
+    if os.path.exists(args.bench_name):
+        cprint("Bench already exists. Only site will be created", level=3)
+        return
+
+    try:
+        env = os.environ.copy()
+        if args.py_version:
+            env["PYENV_VERSION"] = args.py_version
+        init_command = ""
+        if args.node_version:
+            init_command = f"nvm use {args.node_version};"
+        if args.py_version:
+            init_command += f"PYENV_VERSION={args.py_version} "
+        init_command += "bench init "
+        init_command += "--skip-redis-config-generation "
+        init_command += "--verbose " if args.verbose else " "
+        init_command += f"--frappe-path={args.frappe_repo} "
+        init_command += f"--frappe-branch={args.frappe_branch} "
+        init_command += f"--apps_path={args.apps_json} "
+        init_command += args.bench_name
+        command = [
+            "/bin/bash",
+            "-i",
+            "-c",
+            init_command,
+        ]
+        subprocess.call(command, env=env, cwd=os.getcwd())
+        cprint("Configuring Bench ...", level=2)
+        cprint("Set db_host to mariadb", level=3)
+        subprocess.call(
+            ["bench", "set-config", "-g", "db_host", "mariadb"],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+        cprint("Set redis_cache to redis://redis-cache:6379", level=3)
+        subprocess.call(
+            [
+                "bench",
+                "set-config",
+                "-g",
+                "redis_cache",
+                "redis://redis-cache:6379",
+            ],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+        cprint("Set redis_queue to redis://redis-queue:6379", level=3)
+        subprocess.call(
+            [
+                "bench",
+                "set-config",
+                "-g",
+                "redis_queue",
+                "redis://redis-queue:6379",
+            ],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+        cprint("Set redis_socketio to redis://redis-socketio:6379", level=3)
+        subprocess.call(
+            [
+                "bench",
+                "set-config",
+                "-g",
+                "redis_socketio",
+                "redis://redis-socketio:6379",
+            ],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+        cprint("Set developer_mode", level=3)
+        subprocess.call(
+            ["bench", "set-config", "-gp", "developer_mode", "1"],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+    except subprocess.CalledProcessError as e:
+        cprint(e.output, level=1)
+
+
+def create_site_in_bench(args):
+    new_site_cmd = [
+        "bench",
+        "new-site",
+        "--no-mariadb-socket",
+        "--mariadb-root-password=123",
+        "--admin-password=admin",
+    ]
+    apps = os.listdir(f"{os.getcwd()}/{args.bench_name}/apps")
+    apps.remove("frappe")
+    for app in apps:
+        new_site_cmd.append(f"--install-app={app}")
+
+    new_site_cmd.append(args.site_name)
+
+    subprocess.call(
+        new_site_cmd,
+        cwd=os.getcwd() + "/" + args.bench_name,
+    )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/development/installer.sh b/development/installer.sh
deleted file mode 100755
index 634e4fd8..00000000
--- a/development/installer.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/bash
-# Developer Note: Run this script in the /workspace/development directory
-
-export NVM_DIR=~/.nvm
-# shellcheck disable=SC1091
-source $NVM_DIR/nvm.sh
-
-sudo apt -qq update && sudo apt -qq install jq -y
-
-get_client_apps() {
-  apps=$(jq ".\"$client\"" apps.json)
-
-  if [ "$apps" == "null" ]; then
-    echo "No apps found for $client"
-    exit 1
-  fi
-}
-
-validate_bench_exists() {
-  dir="$(pwd)/$bench_name"
-  if [ -d "$dir" ]; then
-    echo "Bench already exists. Only site will be created"
-    is_existing_bench=true
-  else
-    is_existing_bench=false
-  fi
-}
-
-validate_branch() {
-  if [ "$app" == "frappe" ] || [ "$app" == "erpnext" ]; then
-    if [ "$branch" != "develop" ] && [ "$branch" != "version-14" ] && [ "$branch" != "version-13" ]; then
-      echo "Branch should be one of develop or version-14 or version-13"
-      exit 1
-    fi
-  fi
-}
-
-validate_site() {
-  if [[ ! "$site_name" =~ ^.*\.localhost$ ]]; then
-    echo "Site name should end with .localhost"
-    exit 1
-  fi
-
-  if [ "$is_existing_bench" = true ]; then
-    validate_site_exists
-  fi
-}
-
-validate_site_exists() {
-  dir="$(pwd)/$bench_name/sites/$site_name"
-  if [ -d "$dir" ]; then
-    echo "Site already exists. Exiting"
-    exit 1
-  fi
-}
-
-validate_app_exists() {
-  dir="$(pwd)/apps/$app"
-  if [ -d "$dir" ]; then
-    echo "App $app already exists."
-    is_app_installed=true
-  else
-    is_app_installed=false
-  fi
-}
-
-add_fork() {
-  dir="$(pwd)/apps/$app"
-  if [ "$fork" != "null" ]; then
-    git -C "$dir" remote add fork "$fork"
-  fi
-}
-
-install_apps() {
-  initialize_bench=$1
-
-  for row in $(echo "$apps" | jq -r '.[] | @base64'); do
-    # helper function to retrieve values from dict
-    _jq() {
-      echo "${row}" | base64 --decode | jq -r "${1}"
-    }
-
-    app=$(_jq '.name')
-    branch=$(_jq '.branch')
-    upstream=$(_jq '.upstream')
-    fork=$(_jq '.fork')
-
-    if [ "$initialize_bench" = true ] && [ "$app" == "frappe" ]; then
-      init_bench
-    fi
-    if [ "$initialize_bench" = false ]; then
-      get_apps_from_upstream
-    fi
-  done
-}
-
-init_bench() {
-  echo "Creating bench $bench_name"
-
-  if [ "$branch" == "develop" ] || [ "$branch" == "version-14" ]; then
-    python_version=python3.10
-    PYENV_VERSION=3.10.5
-    NODE_VERSION=v16
-  elif [ "$branch" == "version-13" ]; then
-    python_version=python3.9
-    PYENV_VERSION=3.9.9
-    NODE_VERSION=v14
-  fi
-
-  nvm use "$NODE_VERSION"
-  PYENV_VERSION="$PYENV_VERSION" bench init --skip-redis-config-generation --frappe-branch "$branch" --python "$python_version" "$bench_name"
-  cd "$bench_name" || exit
-
-  echo "Setting up config"
-
-  bench set-config -g db_host mariadb
-  bench set-config -g redis_cache redis://redis-cache:6379
-  bench set-config -g redis_queue redis://redis-queue:6379
-  bench set-config -g redis_socketio redis://redis-socketio:6379
-
-  ./env/bin/pip install honcho
-}
-
-get_apps_from_upstream() {
-  validate_app_exists
-  if [ "$is_app_installed" = false ]; then
-    bench get-app --branch "$branch" --resolve-deps "$app" "$upstream" && add_fork
-  fi
-
-  if [ "$app" != "frappe" ]; then
-    all_apps+=("$app")
-  fi
-}
-
-echo "Client Name (from apps.json file)?"
-read -r client && client=${client:-develop_client} && get_client_apps
-
-echo "Bench Directory Name? (give name of existing bench to just create a new site) (default: frappe-bench)"
-read -r bench_name && bench_name=${bench_name:-frappe-bench} && validate_bench_exists
-
-echo "Site Name? (should end with .localhost) (default: site1.localhost)"
-read -r site_name && site_name=${site_name:-site1.localhost} && validate_site
-
-if [ "$is_existing_bench" = true ]; then
-  cd "$bench_name" || exit
-else
-  install_apps true
-fi
-
-echo "Getting apps from upstream for $client"
-all_apps=() && install_apps false
-
-echo "Creating site $site_name"
-bench new-site "$site_name" --mariadb-root-password 123 --admin-password admin --no-mariadb-socket
-
-echo "Installing apps to $site_name"
-bench --site "$site_name" install-app "${all_apps[@]}"
-
-bench --site "$site_name" set-config developer_mode 1
-bench --site "$site_name" clear-cache
diff --git a/docs/development.md b/docs/development.md
index 460d5df9..ee2a834c 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -238,27 +238,38 @@ Most developers work with numerous clients and versions. Moreover, apps may be r
 
 This is simplified using a script to automate the process of creating a new bench / site and installing the required apps.
 
-Create a copy of apps-example.json and name it apps.json
-
-```shell
-cp apps-example.json apps.json
-```
-
-Maintain a directory of all client apps in apps.json. Note that Maintaining a fork is optional in apps.json. Also `name` should be app name in apps.json (could be different from repo name).
+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.
 
 > You may have apps in private repos which may require ssh access. You may use SSH from your home directory on linux (configurable in docker-compose.yml).
 
-After you have created apps.json, run the following command:
-
 ```shell
-bash installer.sh
+python installer.py
 ```
 
-The script will ask for the following information:
+For command help
 
-- Client name (from apps.json).
-- Bench directory name. If you enter existing bench directory name, it will create a new site in that bench. Else it will create a new bench and site.
-- Site name (should end with `.localhost`).
+```shell
+python installer.py --help
+usage: installer.py [-h] [-j APPS_JSON] [-b BENCH_NAME] [-s SITE_NAME] [-r FRAPPE_REPO] [-t FRAPPE_BRANCH] [-p PY_VERSION] [-n NODE_VERSION] [-v]
+
+options:
+  -h, --help            show this help message and exit
+  -j APPS_JSON, --apps-json APPS_JSON
+                        Path to apps.json, default: apps-example.json
+  -b BENCH_NAME, --bench-name BENCH_NAME
+                        Bench directory name, default: frappe-bench
+  -s SITE_NAME, --site-name SITE_NAME
+                        Site name, should end with .localhost, default: development.localhost
+  -r FRAPPE_REPO, --frappe-repo FRAPPE_REPO
+                        frappe repo to use, default: https://github.com/frappe/frappe
+  -t FRAPPE_BRANCH, --frappe-branch FRAPPE_BRANCH
+                        frappe repo to use, default: version-14
+  -p PY_VERSION, --py-version PY_VERSION
+                        python version, default: Not Set
+  -n NODE_VERSION, --node-version NODE_VERSION
+                        node version, default: Not Set
+  -v, --verbose         verbose output
+```
 
 A new bench and / or site is created for the client with following defaults.
 

From 4a7ebf48c4cc6b2344da07de181b09ab55d5b612 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 11 Jul 2023 13:16:03 +0000
Subject: [PATCH 07/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index c0ad31ee..80546d30 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.29.2
+ERPNEXT_VERSION=v14.30.0
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index faf782f3..99da3366 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.29.2
+    image: frappe/erpnext:v14.30.0
     deploy:
       restart_policy:
         condition: on-failure

From 011365c89b3f5e4a20712f3ca4d6eca8a0d3f94c Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 11 Jul 2023 14:24:04 +0000
Subject: [PATCH 08/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 80546d30..9fc933f2 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.30.0
+ERPNEXT_VERSION=v14.30.1
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 99da3366..a71476bd 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.30.0
+    image: frappe/erpnext:v14.30.1
     deploy:
       restart_policy:
         condition: on-failure

From df3daac8ad276543ce3e1eacdc0979ea5c896fe4 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 13 Jul 2023 11:14:57 +0000
Subject: [PATCH 09/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 9fc933f2..f0f5e813 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.30.1
+ERPNEXT_VERSION=v14.30.2
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index a71476bd..746615fc 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.30.1
+    image: frappe/erpnext:v14.30.2
     deploy:
       restart_policy:
         condition: on-failure

From 0b3f24507907de497b7e142e0d0d22ad6c27b9da Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 14 Jul 2023 06:08:22 +0000
Subject: [PATCH 10/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index f0f5e813..bc7b73b9 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.30.2
+ERPNEXT_VERSION=v14.30.3
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 746615fc..ac1d3996 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.30.2
+    image: frappe/erpnext:v14.30.3
     deploy:
       restart_policy:
         condition: on-failure

From e7c2c386b7c9e7a170d1a5ddea3f6f345899ce6a Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 14 Jul 2023 11:11:47 +0000
Subject: [PATCH 11/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index bc7b73b9..c5d1a402 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.30.3
+ERPNEXT_VERSION=v14.30.4
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index ac1d3996..092ea3c8 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.30.3
+    image: frappe/erpnext:v14.30.4
     deploy:
       restart_policy:
         condition: on-failure

From 7abbd83587d439ec720f96a1ce0fa9cd10d4e207 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 14 Jul 2023 13:04:30 +0000
Subject: [PATCH 12/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index c5d1a402..a3abf4ca 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.30.4
+ERPNEXT_VERSION=v14.30.5
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 092ea3c8..7bca28cb 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.30.4
+    image: frappe/erpnext:v14.30.5
     deploy:
       restart_policy:
         condition: on-failure

From f485a13a25c9155ac599018f92f7c6138c8e8e96 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 14 Jul 2023 14:48:14 +0000
Subject: [PATCH 13/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index a3abf4ca..6a23a350 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.30.5
+ERPNEXT_VERSION=v14.30.6
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 7bca28cb..a0f6e8ce 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.30.5
+    image: frappe/erpnext:v14.30.6
     deploy:
       restart_policy:
         condition: on-failure

From c3df323a9ff134996b40d7bd4060f26aa1e84c4c Mon Sep 17 00:00:00 2001
From: Amal Paul <44478238+amalpaul54111@users.noreply.github.com>
Date: Tue, 18 Jul 2023 09:32:27 +0530
Subject: [PATCH 14/32] Tag bench images with the latest bench release version
 (#1183)

Remove latest tag and make it default
---
 .github/workflows/build_bench.yml | 3 +++
 docker-bake.hcl                   | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml
index 9f8fd510..a3c87984 100644
--- a/.github/workflows/build_bench.yml
+++ b/.github/workflows/build_bench.yml
@@ -34,6 +34,9 @@ jobs:
       - name: Set Environment Variables
         run: cat example.env | grep -o '^[^#]*' >> "$GITHUB_ENV"
 
+      - name: Get Bench Latest Version
+        run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV"
+
       - name: Build and test
         uses: docker/bake-action@v3.1.0
         with:
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 568e0668..df77e849 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -32,6 +32,10 @@ variable "BENCH_REPO" {
     default = "https://github.com/frappe/bench"
 }
 
+variable "LATEST_BENCH_RELEASE" {
+    default = "latest"
+}
+
 # Bench image
 
 target "bench" {
@@ -40,7 +44,7 @@ target "bench" {
     }
     context = "images/bench"
     target = "bench"
-    tags = ["frappe/bench:latest"]
+    tags = ["frappe/bench:${LATEST_BENCH_RELEASE}"]
 }
 
 target "bench-test" {

From 96fc3ff31c7ac2e3a5382405edfc4043ef90dea0 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 18 Jul 2023 09:58:44 +0000
Subject: [PATCH 15/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 6a23a350..ad31c026 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.30.6
+ERPNEXT_VERSION=v14.30.7
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index a0f6e8ce..8a8b9c07 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.30.6
+    image: frappe/erpnext:v14.30.7
     deploy:
       restart_policy:
         condition: on-failure

From a5ab1d3717c0eea0e9aecfcfe8655e4ccd7dd8cd Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 18 Jul 2023 14:10:58 +0000
Subject: [PATCH 16/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index ad31c026..43ea368e 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.30.7
+ERPNEXT_VERSION=v14.31.0
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 8a8b9c07..3c375fa9 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.30.7
+    image: frappe/erpnext:v14.31.0
     deploy:
       restart_policy:
         condition: on-failure

From 0936a1a9e3dd925267399d5fd432bece18fefcf9 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 19 Jul 2023 05:54:00 +0000
Subject: [PATCH 17/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 43ea368e..c5ffbe16 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.31.0
+ERPNEXT_VERSION=v14.31.1
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 3c375fa9..eb0b0c38 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.31.0
+    image: frappe/erpnext:v14.31.1
     deploy:
       restart_policy:
         condition: on-failure

From 70c40e2be0a6028be2a164cb12ef74cadd206e43 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 19 Jul 2023 08:21:45 +0000
Subject: [PATCH 18/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index c5ffbe16..2bbfecb3 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.31.1
+ERPNEXT_VERSION=v14.31.2
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index eb0b0c38..9a525595 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.31.1
+    image: frappe/erpnext:v14.31.2
     deploy:
       restart_policy:
         condition: on-failure

From 9429501407f3e64355cca7c6f57df7407705811e Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Thu, 20 Jul 2023 13:03:03 +0530
Subject: [PATCH 19/32] docs: remove obsolete docs (#1186)

---
 docs/troubleshoot.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/docs/troubleshoot.md b/docs/troubleshoot.md
index eb5a9167..a43ed13c 100644
--- a/docs/troubleshoot.md
+++ b/docs/troubleshoot.md
@@ -36,13 +36,6 @@ EXIT;
 
 Note: For MariaDB 10.4 and above use `mysql.global_priv` instead of `mysql.user`.
 
-### Letsencrypt companion not working
-
-- Nginx Letsencrypt Companion needs to be setup before starting ERPNext services.
-- Are domain names in `SITES` variable correct?
-- Is DNS record configured? `A Name` record needs to point to Public IP of server.
-- Try Restarting containers.
-
 ### docker-compose does not recognize variables from `.env` file
 
 If you are using old version of `docker-compose` the .env file needs to be located in directory from where the docker-compose command is executed. There may also be difference in official `docker-compose` and the one packaged by distro. Use `--env-file=.env` if available to explicitly specify the path to file.
@@ -50,6 +43,5 @@ If you are using old version of `docker-compose` the .env file needs to be locat
 ### Windows Based Installation
 
 - Set environment variable `COMPOSE_CONVERT_WINDOWS_PATHS` e.g. `set COMPOSE_CONVERT_WINDOWS_PATHS=1`
-- While using docker machine, port-forward the port 80 of VM to port 80 of host machine
+- While using docker machine, port-forward the ports of VM to ports of host machine. (ports 8080/8000/9000)
 - Name all the sites ending with `.localhost`. and access it via browser locally. e.g. `http://site1.localhost`
-- related issue comment https://github.com/frappe/frappe_docker/issues/448#issuecomment-851723912

From 17385266ee76269cffebd84cd3548e95338ff85c Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 20 Jul 2023 14:54:07 +0000
Subject: [PATCH 20/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 2bbfecb3..5e77a8c2 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.31.2
+ERPNEXT_VERSION=v14.31.3
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 9a525595..e086cec8 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.31.2
+    image: frappe/erpnext:v14.31.3
     deploy:
       restart_policy:
         condition: on-failure

From 7d1d9b17fdb15f761459f610ca93b90779e69e53 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Mon, 24 Jul 2023 12:49:49 +0530
Subject: [PATCH 21/32] fix: use ping api instead of version api (#1190)

---
 tests/test_frappe_docker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_frappe_docker.py b/tests/test_frappe_docker.py
index 1b1ca783..e8fcad0d 100644
--- a/tests/test_frappe_docker.py
+++ b/tests/test_frappe_docker.py
@@ -39,7 +39,7 @@ def assets_cb(text: str):
 
 
 @pytest.mark.parametrize(
-    ("url", "callback"), (("/", index_cb), ("/api/method/version", api_cb))
+    ("url", "callback"), (("/", index_cb), ("/api/method/ping", api_cb))
 )
 def test_endpoints(url: str, callback: Any, frappe_site: str):
     check_url_content(

From cf6bb376485615f4eeb15df61da342aaccc51b26 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Mon, 24 Jul 2023 16:57:39 +0530
Subject: [PATCH 22/32] ci: tag frappe/bench:latest (#1191)

---
 docker-bake.hcl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index df77e849..a217c6ea 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -44,7 +44,10 @@ target "bench" {
     }
     context = "images/bench"
     target = "bench"
-    tags = ["frappe/bench:${LATEST_BENCH_RELEASE}"]
+    tags = [
+        "frappe/bench:${LATEST_BENCH_RELEASE}",
+        "frappe/bench:latest",
+    ]
 }
 
 target "bench-test" {

From 55938bd5fcdff544ce547128df84780cd514f46c Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 26 Jul 2023 04:21:53 +0000
Subject: [PATCH 23/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 5e77a8c2..b3ee83a1 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.31.3
+ERPNEXT_VERSION=v14.32.0
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index e086cec8..88f1ae66 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.31.3
+    image: frappe/erpnext:v14.32.0
     deploy:
       restart_policy:
         condition: on-failure

From 13c0183a79dfe20c3aa4d58f6c9cae65571b3c44 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 26 Jul 2023 06:39:40 +0000
Subject: [PATCH 24/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index b3ee83a1..f941a1c7 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.32.0
+ERPNEXT_VERSION=v14.32.1
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 88f1ae66..c06aee57 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.32.0
+    image: frappe/erpnext:v14.32.1
     deploy:
       restart_policy:
         condition: on-failure

From 8c670e6db739e91900f61d61e5ed9a3521f9cc74 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Mon, 31 Jul 2023 05:10:23 +0530
Subject: [PATCH 25/32] docs: change sitename as per installer.py (#1196)

---
 docs/bench-console-and-vscode-debugger.md |  4 ++--
 docs/development.md                       | 24 +++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/bench-console-and-vscode-debugger.md b/docs/bench-console-and-vscode-debugger.md
index b1668392..d506be0f 100644
--- a/docs/bench-console-and-vscode-debugger.md
+++ b/docs/bench-console-and-vscode-debugger.md
@@ -1,4 +1,4 @@
-Add the following configuration to `launch.json` `configurations` array to start bench console and use debugger. Replace `mysite.localhost` with appropriate site. Also replace `frappe-bench` with name of the bench directory.
+Add the following configuration to `launch.json` `configurations` array to start bench console and use debugger. Replace `development.localhost` with appropriate site. Also replace `frappe-bench` with name of the bench directory.
 
 ```json
 {
@@ -6,7 +6,7 @@ Add the following configuration to `launch.json` `configurations` array to start
   "type": "python",
   "request": "launch",
   "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py",
-  "args": ["frappe", "--site", "mysite.localhost", "console"],
+  "args": ["frappe", "--site", "development.localhost", "console"],
   "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python",
   "cwd": "${workspaceFolder}/frappe-bench/sites",
   "env": {
diff --git a/docs/development.md b/docs/development.md
index ee2a834c..1adea89c 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -150,17 +150,17 @@ sitename MUST end with .localhost for trying deployments locally.
 for example:
 
 ```shell
-bench new-site mysite.localhost --no-mariadb-socket
+bench new-site development.localhost --no-mariadb-socket
 ```
 
 The same command can be run non-interactively as well:
 
 ```shell
-bench new-site mysite.localhost --mariadb-root-password 123 --admin-password admin --no-mariadb-socket
+bench new-site development.localhost --mariadb-root-password 123 --admin-password admin --no-mariadb-socket
 ```
 
 The command will ask the MariaDB root password. The default root password is `123`.
-This will create a new site and a `mysite.localhost` directory under `frappe-bench/sites`.
+This will create a new site and a `development.localhost` directory under `frappe-bench/sites`.
 The option `--no-mariadb-socket` will configure site's database credentials to work with docker.
 You may need to configure your system /etc/hosts if you're on Linux, Mac, or its Windows equivalent.
 
@@ -186,8 +186,8 @@ Note: If PostgreSQL is not required, the postgresql service / container can be s
 To develop a new app, the last step will be setting the site into developer mode. Documentation is available at [this link](https://frappe.io/docs/user/en/guides/app-development/how-enable-developer-mode-in-frappe).
 
 ```shell
-bench --site mysite.localhost set-config developer_mode 1
-bench --site mysite.localhost clear-cache
+bench --site development.localhost set-config developer_mode 1
+bench --site development.localhost clear-cache
 ```
 
 ### Install an app
@@ -201,21 +201,21 @@ To install custom app
 ```shell
 # --branch is optional, use it to point to branch on custom app repository
 bench get-app --branch version-12 https://github.com/myusername/myapp
-bench --site mysite.localhost install-app myapp
+bench --site development.localhost install-app myapp
 ```
 
 At the time of this writing, the Payments app has been factored out of the Version 14 ERPNext app and is now a separate app. ERPNext will not install it.
 
 ```shell
 bench get-app --branch version-14 --resolve-deps erpnext
-bench --site mysite.localhost install-app erpnext
+bench --site development.localhost install-app erpnext
 ```
 
 To install ERPNext (from the version-13 branch):
 
 ```shell
 bench get-app --branch version-13 erpnext
-bench --site mysite.localhost install-app erpnext
+bench --site development.localhost install-app erpnext
 ```
 
 Note: Both frappe and erpnext must be on branch with same name. e.g. version-14
@@ -229,7 +229,7 @@ bench start
 ```
 
 You can now login with user `Administrator` and the password you choose when creating the site.
-Your website will now be accessible at location [mysite.localhost:8000](http://mysite.localhost:8000)
+Your website will now be accessible at location [development.localhost:8000](http://development.localhost:8000)
 Note: To start bench with debugger refer section for debugging.
 
 ### Setup bench / new site using script
@@ -312,7 +312,7 @@ For advance vscode configuration in the devcontainer, change the config files in
 You can launch a simple interactive shell console in the terminal with:
 
 ```shell
-bench --site mysite.localhost console
+bench --site development.localhost console
 ```
 
 More likely, you may want to launch VSCode interactive console based on Jupyter kernel.
@@ -327,12 +327,12 @@ The first step is installing and updating the required software. Usually the fra
 
 Then, run the command `Python: Show Python interactive window` from the VSCode command palette.
 
-Replace `mysite.localhost` with your site and run the following code in a Jupyter cell:
+Replace `development.localhost` with your site and run the following code in a Jupyter cell:
 
 ```python
 import frappe
 
-frappe.init(site='mysite.localhost', sites_path='/workspace/development/frappe-bench/sites')
+frappe.init(site='development.localhost', sites_path='/workspace/development/frappe-bench/sites')
 frappe.connect()
 frappe.local.lang = frappe.db.get_default('lang')
 frappe.db.connect()

From 480c642325da44c45252d78900b700bf53800f03 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 20:00:16 +0530
Subject: [PATCH 26/32] chore(deps): Update pre-commit hooks (#1198)

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 79663e3f..4c9358a0 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.9.0
+    rev: v3.10.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus]

From 29e9ccf20aab3c84aa1104dad978d6869d7ac12d Mon Sep 17 00:00:00 2001
From: Rishab Manocha <mrishab@users.noreply.github.com>
Date: Mon, 31 Jul 2023 07:32:24 -0700
Subject: [PATCH 27/32] Fixed the instructions to refer to the correct filename
 (#1197)

---
 docs/setup_for_linux_mac.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md
index a6ca38bd..c805fe14 100644
--- a/docs/setup_for_linux_mac.md
+++ b/docs/setup_for_linux_mac.md
@@ -239,7 +239,7 @@ volumes:
 step3: run the docker
 
 ```
-docker-compose -f ./pwd.yaml up
+docker-compose -f ./pwd.yml up
 ```
 
 ---

From 4207982e65cd687c66c632139aae7782b7417abc Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 1 Aug 2023 18:18:32 +0000
Subject: [PATCH 28/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index f941a1c7..2f918e78 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.32.1
+ERPNEXT_VERSION=v14.33.0
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index c06aee57..5ac8500c 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.32.1
+    image: frappe/erpnext:v14.33.0
     deploy:
       restart_policy:
         condition: on-failure

From 8757ad975506a54023c309b841657641be914f2a Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 2 Aug 2023 07:44:54 +0000
Subject: [PATCH 29/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 2f918e78..8a5e60c1 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.33.0
+ERPNEXT_VERSION=v14.33.1
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 5ac8500c..4363b23d 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.33.0
+    image: frappe/erpnext:v14.33.1
     deploy:
       restart_policy:
         condition: on-failure

From 1db2bc6b6dbb8385d390d2d068137afd5134c1a8 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 3 Aug 2023 08:02:43 +0000
Subject: [PATCH 30/32] chore: Update example.env

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

diff --git a/example.env b/example.env
index 8a5e60c1..fe979047 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.33.1
+ERPNEXT_VERSION=v14.33.2
 
 DB_PASSWORD=123
 
diff --git a/pwd.yml b/pwd.yml
index 4363b23d..f77e87a4 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: none
@@ -90,7 +90,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -112,7 +112,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -126,7 +126,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -140,7 +140,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -178,7 +178,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: on-failure
@@ -190,7 +190,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.33.1
+    image: frappe/erpnext:v14.33.2
     deploy:
       restart_policy:
         condition: on-failure

From eb88625f93bf684e709a448511ea572a30404fdd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Aug 2023 12:45:00 +0530
Subject: [PATCH 31/32] chore(deps): Update pre-commit hooks (#1203)

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 4c9358a0..a541f46c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,7 +24,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0
+    rev: v3.0.1
     hooks:
       - id: prettier
 

From cf499acc363cd0c2babbe1dc445bcd86c1ba41a2 Mon Sep 17 00:00:00 2001
From: Chris Darby <me@chrisdarby.com>
Date: Tue, 8 Aug 2023 05:08:36 +0100
Subject: [PATCH 32/32] Broken link to environment variables definition fixed
 (#1205)

---
 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 1d2dd72f..afe92ae7 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.md#configuration). Set the necessary variables in the `.env` file.
+Note: To know more about environment variable [read here](./environment-variables.md). Set the necessary variables in the `.env` file.
 
 ## Generate docker-compose.yml for variety of setups