build: add pkg-config dependency

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

---
updated-dependencies:
- dependency-name: pytest
  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>

.github/dependabot.yml

@@ -11,22 +11,12 @@ updates:
       interval: daily
 
   - package-ecosystem: docker
-    directory: images/nginx
+    directory: images/production
     schedule:
       interval: daily
 
   - package-ecosystem: docker
-    directory: images/worker
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: images/socketio
-    schedule:
-      interval: daily
-
-  - package-ecosystem: npm
-    directory: images/socketio
+    directory: images/custom
     schedule:
       interval: daily
 

.github/scripts/get_latest_tags.py

@@ -9,7 +9,7 @@ import sys
 from typing import Literal
 
 Repo = Literal["frappe", "erpnext"]
-MajorVersion = Literal["12", "13", "14", "develop"]
+MajorVersion = Literal["12", "13", "14", "15", "develop"]
 
 
 def get_latest_tag(repo: Repo, version: MajorVersion) -> str:
@@ -57,7 +57,7 @@ def main(_args: list[str]) -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument("--repo", choices=["frappe", "erpnext"], required=True)
     parser.add_argument(
-        "--version", choices=["12", "13", "14", "develop"], required=True
+        "--version", choices=["12", "13", "14", "15", "develop"], required=True
     )
     args = parser.parse_args(_args)
 

.github/scripts/update_example_env.py

@@ -2,29 +2,25 @@ import os
 import re
 
 
-def get_versions():
-    frappe_version = os.getenv("FRAPPE_VERSION")
+def get_erpnext_version():
     erpnext_version = os.getenv("ERPNEXT_VERSION")
-    assert frappe_version, "No Frappe version set"
     assert erpnext_version, "No ERPNext version set"
-    return frappe_version, erpnext_version
+    return erpnext_version
 
 
-def update_env(frappe_version: str, erpnext_version: str):
+def update_env(erpnext_version: str):
     with open("example.env", "r+") as f:
         content = f.read()
-        for env, var in (
-            ("FRAPPE_VERSION", frappe_version),
-            ("ERPNEXT_VERSION", erpnext_version),
-        ):
-            content = re.sub(rf"{env}=.*", f"{env}={var}", content)
+        content = re.sub(
+            rf"ERPNEXT_VERSION=.*", f"ERPNEXT_VERSION={erpnext_version}", content
+        )
         f.seek(0)
         f.truncate()
         f.write(content)
 
 
 def main() -> int:
-    update_env(*get_versions())
+    update_env(get_erpnext_version())
     return 0
 
 

.github/scripts/update_pwd.py

@@ -13,12 +13,9 @@ def get_versions():
 def update_pwd(frappe_version: str, erpnext_version: str):
     with open("pwd.yml", "r+") as f:
         content = f.read()
-        for image, version in (
-            ("frappe/frappe-socketio", frappe_version),
-            ("frappe/erpnext-worker", erpnext_version),
-            ("frappe/erpnext-nginx", erpnext_version),
-        ):
-            content = re.sub(rf"{image}:.*", f"{image}:{version}", content)
+        content = re.sub(
+            rf"frappe/erpnext:.*", f"frappe/erpnext:{erpnext_version}", content
+        )
         f.seek(0)
         f.truncate()
         f.write(content)

.github/workflows/build_bench.yml

@@ -20,32 +20,39 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           image: tonistiigi/binfmt:latest
           platforms: all
 
       - name: Setup Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set Environment Variables
+        run: cat example.env | grep -o '^[^#]*' >> "$GITHUB_ENV"
+
+      - 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@v2.2.0
+        uses: docker/bake-action@v6.5.0
         with:
+          source: .
           targets: bench-test
 
       - name: Login
         if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Push
         if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-        uses: docker/bake-action@v2.2.0
+        uses: docker/bake-action@v6.5.0
         with:
           targets: bench
           push: true

.github/workflows/build_develop.yml

@@ -5,9 +5,7 @@ on:
     branches:
       - main
     paths:
-      - images/nginx/**
-      - images/socketio/**
-      - images/worker/**
+      - images/production/**
       - overrides/**
       - tests/**
       - compose.yaml
@@ -28,6 +26,8 @@ jobs:
       repo: erpnext
       version: develop
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+      python_version: 3.11.6
+      node_version: 18.18.2
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/build_stable.yml

@@ -5,9 +5,7 @@ on:
     branches:
       - main
     paths:
-      - images/nginx/**
-      - images/socketio/**
-      - images/worker/**
+      - images/production/**
       - overrides/**
       - tests/**
       - compose.yaml
@@ -19,9 +17,7 @@ on:
     branches:
       - main
     paths:
-      - images/nginx/**
-      - images/socketio/**
-      - images/worker/**
+      - images/production/**
       - overrides/**
       - tests/**
       - compose.yaml
@@ -34,32 +30,26 @@ on:
   workflow_dispatch:
 
 jobs:
-  v12:
-    uses: ./.github/workflows/docker-build-push.yml
-    with:
-      repo: erpnext
-      version: "12"
-      push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-    secrets:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-
-  v13:
-    uses: ./.github/workflows/docker-build-push.yml
-    with:
-      repo: erpnext
-      version: "13"
-      push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-    secrets:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-
   v14:
     uses: ./.github/workflows/docker-build-push.yml
     with:
       repo: erpnext
       version: "14"
       push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+      python_version: 3.10.13
+      node_version: 16.20.2
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  v15:
+    uses: ./.github/workflows/docker-build-push.yml
+    with:
+      repo: erpnext
+      version: "15"
+      push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+      python_version: 3.11.6
+      node_version: 18.18.2
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -68,19 +58,19 @@ jobs:
     name: Update example.env and pwd.yml
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-    needs: v14
+    needs: v15
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
       - name: Get latest versions
-        run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 14
+        run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 15
 
       - name: Update
         run: |
@@ -106,11 +96,11 @@ jobs:
     name: Release Helm
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-    needs: v14
+    needs: v15
 
     steps:
       - name: Setup deploy key
-        uses: webfactory/ssh-agent@v0.5.4
+        uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.HELM_DEPLOY_KEY }}
 
@@ -123,4 +113,4 @@ jobs:
         run: |
           git clone git@github.com:frappe/helm.git && cd helm
           pip install -r release_wizard/requirements.txt
-          ./release_wizard/wizard 14 patch --remote origin --ci
+          ./release_wizard/wizard 15 patch --remote origin --ci

.github/workflows/docker-build-push.yml

@@ -14,6 +14,14 @@ on:
       push:
         required: true
         type: boolean
+      python_version:
+        required: true
+        type: string
+        description: Python Version
+      node_version:
+        required: true
+        type: string
+        description: NodeJS Version
     secrets:
       DOCKERHUB_USERNAME:
         required: true
@@ -29,34 +37,44 @@ jobs:
         image: registry:2
         ports:
           - 5000:5000
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
 
       - name: Setup Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          driver-opts: network=host
+        uses: docker/setup-buildx-action@v3
 
       - name: Get latest versions
         run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }}
 
+      - name: Set build args
+        run: |
+          echo "PYTHON_VERSION=${{ inputs.python_version }}" >> "$GITHUB_ENV"
+          echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV"
+
       - name: Build
-        uses: docker/bake-action@v2.2.0
+        uses: docker/bake-action@v6.5.0
         with:
+          source: .
           push: true
         env:
           REGISTRY_USER: localhost:5000/frappe
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
-      - name: Install Docker Compose v2
-        uses: ndeloof/install-compose-action@4a33bc31f327b8231c4f343f6fba704fedc0fa23
-
       - name: Install dependencies
         run: |
           python -m venv venv
@@ -67,13 +85,14 @@ jobs:
 
       - name: Login
         if: ${{ inputs.push }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Push
         if: ${{ inputs.push }}
-        uses: docker/bake-action@v2.2.0
+        uses: docker/bake-action@v6.5.0
         with:
           push: true
+          set: "*.platform=linux/amd64,linux/arm64"

.github/workflows/lint.yml

@@ -13,27 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.10.6"
 
       # For shfmt pre-commit hook
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: "^1.14"
 
-      - name: Cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/pre-commit
-            ~/.cache/pip
-          key: lint-${{ hashFiles('.pre-commit-config.yaml') }}
-
       - name: Install pre-commit
         run: pip install -U pre-commit
 

.github/workflows/pre-commit-autoupdate.yml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Update pre-commit hooks
         uses: vrslev/pre-commit-autoupdate@v1.0.0
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v7
         with:
           branch: pre-commit-autoupdate
           title: "chore(deps): Update pre-commit hooks"

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: This issue has been automatically marked as stale. You have a week to explain why you believe this is an error.

.gitignore

@@ -6,6 +6,8 @@ sites
 
 development/*
 !development/README.md
+!development/installer.py
+!development/apps-example.json
 !development/vscode-example/
 
 # Pycharm
@@ -23,3 +25,6 @@ development/*
 *.pyc
 __pycache__
 venv
+
+# NodeJS
+node_modules

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v5.0.0
     hooks:
       - id: check-executables-have-shebangs
       - id: check-shebang-scripts-are-executable
@@ -8,28 +8,30 @@ repos:
       - id: end-of-file-fixer
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
 
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 25.1.0
     hooks:
       - id: black
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 6.0.1
     hooks:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
+        additional_dependencies:
+          - prettier@3.5.2
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.1
+    rev: v2.4.1
     hooks:
       - id: codespell
         args:
@@ -47,7 +49,7 @@ repos:
         types: [shell]
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.4
+    rev: v0.10.0.1
     hooks:
       - id: shellcheck
         args: [-x]

CODE_OF_CONDUCT.md

@@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
 size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
+level of experience, education, socioeconomic status, nationality, personal
 appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards

CONTRIBUTING.md

@@ -61,16 +61,21 @@ Run pytest:
 pytest
 ```
 
-> We also have `requirements-dev.txt` file that contains development requirements for backend image (you can find it in `images/worker/` directory).
-
 # Documentation
 
 Place relevant markdown files in the `docs` directory and index them in README.md located at the root of repo.
 
-# Wiki
-
-Add alternatives that can be used optionally along with frappe_docker. Add articles to list on home page as well.
-
 # Frappe and ERPNext updates
 
 Each Frappe/ERPNext release triggers new stable images builds as well as bump to helm chart.
+
+# Maintenance
+
+In case of new release of Debian. e.g. bullseye to bookworm. Change following files:
+
+- `images/erpnext/Containerfile` and `images/custom/Containerfile`: Change the files to use new debian release, make sure new python version tag that is available on new debian release image. e.g. 3.9.9 (bullseye) to 3.9.17 (bookworm) or 3.10.5 (bullseye) to 3.10.12 (bookworm). Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
+- `images/bench/Dockerfile`: Change the files to use new debian release. Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
+
+Change following files on release of ERPNext
+
+- `.github/workflows/build_stable.yml`: Add the new release step under `jobs` and remove the unmaintained one. e.g. In case v12, v13 available, v14 will be added and v12 will be removed on release of v14. Also change the `needs:` for later steps to `v14` from `v13`.

README.md

@@ -5,56 +5,86 @@ Everything about [Frappe](https://github.com/frappe/frappe) and [ERPNext](https:
 
 # Getting Started
 
-To get started, you need Docker, docker-compose and git setup on your machine. For Docker basics and best practices. Refer Docker [documentation](http://docs.docker.com).
-After that, clone this repo:
+To get started you need [Docker](https://docs.docker.com/get-docker/), [docker-compose](https://docs.docker.com/compose/), and [git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git) setup on your machine. For Docker basics and best practices refer to Docker's [documentation](http://docs.docker.com).
+
+Once completed, chose one of the following two sections for next steps.
+
+### Try in Play With Docker
+
+To play in an already set up sandbox, in your browser, click the button below:
+
+<a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/frappe/frappe_docker/main/pwd.yml">
+  <img src="https://raw.githubusercontent.com/play-with-docker/stacks/master/assets/images/button.png" alt="Try in PWD"/>
+</a>
+
+### Try on your Dev environment
+
+First clone the repo:
 
 ```sh
 git clone https://github.com/frappe/frappe_docker
 cd frappe_docker
 ```
 
-### Try in Play With Docker
+Then run: `docker compose -f pwd.yml up -d`
 
-<a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/frappe/frappe_docker/main/pwd.yml">
-  <img src="https://raw.githubusercontent.com/play-with-docker/stacks/master/assets/images/button.png" alt="Try in PWD"/>
-</a>
+### To run on ARM64 architecture follow this instructions
+
+After cloning the repo run this command to build multi-architecture images specifically for ARM64.
+
+`docker buildx bake --no-cache --set "*.platform=linux/arm64"`
+
+and then
+
+- add `platform: linux/arm64` to all services in the `pwd.yml`
+- replace the current specified versions of erpnext image on `pwd.yml` with `:latest`
+
+Then run: `docker compose -f pwd.yml up -d`
+
+## Final steps
 
 Wait for 5 minutes for ERPNext site to be created or check `create-site` container logs before opening browser on port 8080. (username: `Administrator`, password: `admin`)
 
-# Development
+If you ran in a Dev Docker environment, to view container logs: `docker compose -f pwd.yml logs -f create-site`. Don't worry about some of the initial error messages, some services take a while to become ready, and then they go away.
 
-We have baseline for developing in VSCode devcontainer with [frappe/bench](https://github.com/frappe/bench). [Start development](development).
+# Documentation
 
-# Production
+### [Frequently Asked Questions](https://github.com/frappe/frappe_docker/wiki/Frequently-Asked-Questions)
 
-We provide simple and intuitive production setup with prebuilt Frappe and ERPNext images and compose files. To learn more about those, [read the docs](docs/images-and-compose-files.md).
+### [Production](#production)
 
-Also, there's docs to help with deployment:
+- [List of containers](docs/list-of-containers.md)
+- [Single Compose Setup](docs/single-compose-setup.md)
+- [Environment Variables](docs/environment-variables.md)
+- [Single Server Example](docs/single-server-example.md)
+- [Setup Options](docs/setup-options.md)
+- [Site Operations](docs/site-operations.md)
+- [Backup and Push Cron Job](docs/backup-and-push-cronjob.md)
+- [Port Based Multi Tenancy](docs/port-based-multi-tenancy.md)
+- [Migrate from multi-image setup](docs/migrate-from-multi-image-setup.md)
+- [running on linux/mac](docs/setup_for_linux_mac.md)
+- [TLS for local deployment](docs/tls-for-local-deployment.md)
 
-- Examples:
-  - [Single Server](docs/single-server-example.md)
-  - [Setup options](docs/setup-options.md)
-  - [Kubernetes (frappe/helm)](https://helm.erpnext.com)
-- [Site operations](docs/site-operations.md).
-- Other
-  - [backup and push cron jobs](docs/backup-and-push-cronjob.md)
-  - [bench console and vscode debugger](docs/bench-console-and-vscode-debugger.md)
-  - [build version 10](docs/build-version-10-images.md)
-  - [connect to localhost services from containers for local app development](docs/connect-to-localhost-services-from-containers-for-local-app-development.md)
-  - [patch code from images](docs/patch-code-from-images.md)
-  - [port based multi tenancy](docs/port-based-multi-tenancy.md)
-- [Troubleshoot](docs/troubleshoot.md)
+### [Custom Images](#custom-images)
 
-# Custom app
+- [Custom Apps](docs/custom-apps.md)
+- [Custom Apps with podman](docs/custom-apps-podman.md)
+- [Build Version 10 Images](docs/build-version-10-images.md)
 
-Learn how to containerize your custom Frappe app(s) in [this guide](custom_app/README.md).
+### [Development](#development)
+
+- [Development using containers](docs/development.md)
+- [Bench Console and VSCode Debugger](docs/bench-console-and-vscode-debugger.md)
+- [Connect to localhost services](docs/connect-to-localhost-services-from-containers-for-local-app-development.md)
+
+### [Troubleshoot](docs/troubleshoot.md)
 
 # Contributing
 
 If you want to contribute to this repo refer to [CONTRIBUTING.md](CONTRIBUTING.md)
 
-This repository is only for Docker related stuff. You also might want to contribute to:
+This repository is only for container related stuff. You also might want to contribute to:
 
 - [Frappe framework](https://github.com/frappe/frappe#contributing),
 - [ERPNext](https://github.com/frappe/erpnext#contributing),
-- or [Frappe Bench](https://github.com/frappe/bench).
+- [Frappe Bench](https://github.com/frappe/bench).

compose.yaml

@@ -1,33 +1,56 @@
+x-customizable-image: &customizable_image
+  # By default the image used only contains the `frappe` and `erpnext` apps.
+  # See https://github.com/frappe/frappe_docker/blob/main/docs/custom-apps.md
+  # about using custom images.
+  image: ${CUSTOM_IMAGE:-frappe/erpnext}:${CUSTOM_TAG:-$ERPNEXT_VERSION}
+  pull_policy: ${PULL_POLICY:-always}
+  restart: ${RESTART_POLICY:-unless-stopped}
+
 x-depends-on-configurator: &depends_on_configurator
   depends_on:
     configurator:
       condition: service_completed_successfully
 
 x-backend-defaults: &backend_defaults
-  <<: *depends_on_configurator
-  image: frappe/frappe-worker:${FRAPPE_VERSION:?No Frappe version set}
+  <<: [*depends_on_configurator, *customizable_image]
   volumes:
     - sites:/home/frappe/frappe-bench/sites
-    - assets:/home/frappe/frappe-bench/sites/assets:ro
 
 services:
   configurator:
     <<: *backend_defaults
-    command: configure.py
+    platform: linux/amd64
+    entrypoint:
+      - bash
+      - -c
+    # add redis_socketio for backward compatibility
+    command:
+      - >
+        ls -1 apps > sites/apps.txt;
+        bench set-config -g db_host $$DB_HOST;
+        bench set-config -gp db_port $$DB_PORT;
+        bench set-config -g redis_cache "redis://$$REDIS_CACHE";
+        bench set-config -g redis_queue "redis://$$REDIS_QUEUE";
+        bench set-config -g redis_socketio "redis://$$REDIS_QUEUE";
+        bench set-config -gp socketio_port $$SOCKETIO_PORT;
     environment:
-      DB_HOST: ${DB_HOST}
-      DB_PORT: ${DB_PORT}
-      REDIS_CACHE: ${REDIS_CACHE}
-      REDIS_QUEUE: ${REDIS_QUEUE}
-      REDIS_SOCKETIO: ${REDIS_SOCKETIO}
+      DB_HOST: ${DB_HOST:-}
+      DB_PORT: ${DB_PORT:-}
+      REDIS_CACHE: ${REDIS_CACHE:-}
+      REDIS_QUEUE: ${REDIS_QUEUE:-}
       SOCKETIO_PORT: 9000
     depends_on: {}
+    restart: on-failure
 
   backend:
     <<: *backend_defaults
+    platform: linux/amd64
 
   frontend:
-    image: frappe/frappe-nginx:${FRAPPE_VERSION}
+    <<: *customizable_image
+    platform: linux/amd64
+    command:
+      - nginx-entrypoint.sh
     environment:
       BACKEND: backend:8000
       SOCKETIO: websocket:9000
@@ -35,36 +58,38 @@ services:
       UPSTREAM_REAL_IP_ADDRESS: ${UPSTREAM_REAL_IP_ADDRESS:-127.0.0.1}
       UPSTREAM_REAL_IP_HEADER: ${UPSTREAM_REAL_IP_HEADER:-X-Forwarded-For}
       UPSTREAM_REAL_IP_RECURSIVE: ${UPSTREAM_REAL_IP_RECURSIVE:-off}
+      PROXY_READ_TIMEOUT: ${PROXY_READ_TIMEOUT:-120}
+      CLIENT_MAX_BODY_SIZE: ${CLIENT_MAX_BODY_SIZE:-50m}
     volumes:
-      - sites:/usr/share/nginx/html/sites
-      - assets:/usr/share/nginx/html/assets
+      - sites:/home/frappe/frappe-bench/sites
     depends_on:
       - backend
       - websocket
 
   websocket:
-    <<: *depends_on_configurator
-    image: frappe/frappe-socketio:${FRAPPE_VERSION}
+    <<: [*depends_on_configurator, *customizable_image]
+    platform: linux/amd64
+    command:
+      - node
+      - /home/frappe/frappe-bench/apps/frappe/socketio.js
     volumes:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
     <<: *backend_defaults
-    command: bench worker --queue short
-
-  queue-default:
-    <<: *backend_defaults
-    command: bench worker --queue default
+    platform: linux/amd64
+    command: bench worker --queue short,default
 
   queue-long:
     <<: *backend_defaults
-    command: bench worker --queue long
+    platform: linux/amd64
+    command: bench worker --queue long,default,short
 
   scheduler:
     <<: *backend_defaults
+    platform: linux/amd64
     command: bench schedule
 
 # ERPNext requires local assets access (Frappe does not)
 volumes:
   sites:
-  assets:

custom_app/README.md

@@ -1,46 +0,0 @@
-This is basic configuration for building images and testing custom apps that use Frappe.
-
-You can see that there's four files in this folder:
-
-- `backend.Dockerfile`,
-- `frontend.Dockerfile`,
-- `docker-bake.hcl`,
-- `compose.override.yaml`.
-
-Python code will `backend.Dockerfile`. JS and CSS (and other fancy frontend stuff) files will be built in `frontend.Dockerfile` if required and served from there.
-
-`docker-bake.hcl` is reference file for cool new [Buildx Bake](https://github.com/docker/buildx/blob/master/docs/reference/buildx_bake.md). It helps to build images without having to remember all build arguments.
-
-`compose.override.yaml` is [Compose](https://docs.docker.com/compose/compose-file/) override that replaces images from [main compose file](https://github.com/frappe/frappe_docker/blob/main/compose.yaml) so it would use your own images.
-
-To get started, install Docker and [Buildx](https://github.com/docker/buildx#installing). Then copy all content of this folder (except this README) to your app's root directory. Also copy `compose.yaml` in the root of this repository.
-
-Before the next step—to build images—replace "custom_app" with your app's name in `docker-bake.hcl`. After that, let's try to build:
-
-```bash
-FRAPPE_VERSION=... ERPNEXT_VERSION=... docker buildx bake
-```
-
-> 💡 We assume that majority of our users use ERPNext, that's why images in this tutorial are based on ERPNext images. If don't want ERPNext, change base image in Dockerfiles and remove ERPNEXT_VERSION from bake file.
-
-If something goes wrong feel free to leave an issue.
-
-To test if site works, setup `.env` file (check [example](<(https://github.com/frappe/frappe_docker/blob/main/example.env)>)) and run:
-
-```bash
-docker-compose -f compose.yaml -f overrides/compose.noproxy.yaml -f overrides/compose.mariadb.yaml -f overrides/compose.redis.yaml -f custom_app/compose.override.yaml up -d
-docker-compose exec backend \
-  bench new-site 127.0.0.1 \
-    --mariadb-root-password 123 \
-    --admin-password admin \
-    --install-app <Name of your app>
-docker-compose restart backend
-```
-
-Cool! You just containerized your app!
-
-## Installing multiple apps
-
-Both backend and frontend builds contain `install-app` script that places app where it should be. Each call to script installs given app. Usage: `install-app [APP_NAME]`.
-
-If you want to install an app from git, clone it locally, COPY in Dockerfile.

custom_app/backend.Dockerfile

@@ -1,14 +0,0 @@
-# syntax=docker/dockerfile:1.3
-
-ARG ERPNEXT_VERSION
-FROM frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-USER root
-
-ARG APP_NAME
-COPY . ../apps/${APP_NAME}
-
-RUN --mount=type=cache,target=/root/.cache/pip \
-    install-app ${APP_NAME}
-
-USER frappe

custom_app/compose.override.yaml

@@ -1,21 +0,0 @@
-services:
-  configurator:
-    image: custom_app/worker:${VERSION}
-
-  backend:
-    image: custom_app/worker:${VERSION}
-
-  frontend:
-    image: custom_app/nginx:${VERSION}
-
-  queue-short:
-    image: custom_app/worker:${VERSION}
-
-  queue-default:
-    image: custom_app/worker:${VERSION}
-
-  queue-long:
-    image: custom_app/worker:${VERSION}
-
-  scheduler:
-    image: custom_app/worker:${VERSION}

custom_app/docker-bake.hcl

@@ -1,27 +0,0 @@
-APP_NAME="custom_app"
-
-variable "FRAPPE_VERSION" {}
-variable "ERPNEXT_VERSION" {}
-
-group "default" {
-    targets = ["backend", "frontend"]
-}
-
-target "backend" {
-    dockerfile = "backend.Dockerfile"
-    tags = ["custom_app/worker:latest"]
-    args = {
-      "ERPNEXT_VERSION" = ERPNEXT_VERSION
-      "APP_NAME" = APP_NAME
-    }
-}
-
-target "frontend" {
-    dockerfile = "frontend.Dockerfile"
-    tags = ["custom_app/nginx:latest"]
-    args = {
-      "FRAPPE_VERSION" = FRAPPE_VERSION
-      "ERPNEXT_VERSION" = ERPNEXT_VERSION
-      "APP_NAME" = APP_NAME
-    }
-}

custom_app/frontend.Dockerfile

@@ -1,13 +0,0 @@
-ARG FRAPPE_VERSION
-ARG ERPNEXT_VERSION
-
-FROM frappe/assets-builder:${FRAPPE_VERSION} as assets
-
-ARG APP_NAME
-COPY . apps/${APP_NAME}
-RUN install-app ${APP_NAME}
-
-
-FROM frappe/erpnext-nginx:${ERPNEXT_VERSION}
-
-COPY --from=assets /out /usr/share/nginx/html

devcontainer-example/devcontainer.json

@@ -2,24 +2,31 @@
   "name": "Frappe Bench",
   "forwardPorts": [8000, 9000, 6787],
   "remoteUser": "frappe",
-  "settings": {
-    "terminal.integrated.profiles.linux": {
-      "frappe bash": {
-        "path": "/bin/bash"
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "ms-vscode.live-server",
+        "grapecity.gc-excelviewer",
+        "mtxr.sqltools",
+        "visualstudioexptteam.vscodeintellicode"
+      ],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "frappe bash": {
+            "path": "/bin/bash"
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "frappe bash",
+        "debug.node.autoAttach": "disabled"
       }
-    },
-    "terminal.integrated.defaultProfile.linux": "frappe bash",
-    "debug.node.autoAttach": "disabled"
+    }
   },
   "dockerComposeFile": "./docker-compose.yml",
   "service": "frappe",
   "workspaceFolder": "/workspace/development",
   "shutdownAction": "stopCompose",
-  "extensions": [
-    "ms-python.python",
-    "ms-vscode.live-server",
-    "grapecity.gc-excelviewer",
-    "mtxr.sqltools",
-    "visualstudioexptteam.vscodeintellicode"
+  "mounts": [
+    "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/frappe/.ssh,type=bind,consistency=cached"
   ]
 }

devcontainer-example/docker-compose.yml

@@ -1,7 +1,8 @@
 version: "3.7"
 services:
   mariadb:
-    image: mariadb:10.6
+    image: docker.io/mariadb:10.6
+    platform: linux/amd64
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci
@@ -20,27 +21,71 @@ services:
   #   volumes:
   #     - postgresql-data:/var/lib/postgresql/data
 
+  # Enable Mailpit if you need to test outgoing mail services
+  # See https://mailpit.axllent.org/
+  #  mailpit:
+  #    image: axllent/mailpit
+  #    volumes:
+  #      - mailpit-data:/data
+  #    ports:
+  #      - 8025:8025
+  #      - 1025:1025
+  #    environment:
+  #      MP_MAX_MESSAGES: 5000
+  #      MP_DATA_FILE: /data/mailpit.db
+  #      MP_SMTP_AUTH_ACCEPT_ANY: 1
+  #      MP_SMTP_AUTH_ALLOW_INSECURE: 1
+
   redis-cache:
-    image: redis:alpine
+    image: docker.io/redis:alpine
+    platform: linux/amd64
 
   redis-queue:
-    image: redis:alpine
-
-  redis-socketio:
-    image: redis:alpine
+    image: docker.io/redis:alpine
+    platform: linux/amd64
 
   frappe:
-    image: frappe/bench:latest
+    image: docker.io/frappe/bench:latest
+    platform: linux/amd64
     command: sleep infinity
     environment:
       - SHELL=/bin/bash
     volumes:
       - ..:/workspace:cached
+      # Enable if you require git cloning
+      # - ${HOME}/.ssh:/home/frappe/.ssh
     working_dir: /workspace/development
     ports:
       - 8000-8005:8000-8005
       - 9000-9005:9000-9005
-
+  # enable the below service if you need Cypress UI Tests to be executed
+  # Before enabling ensure install_x11_deps.sh has been executed and display variable is exported.
+  # Run install_x11_deps.sh again if DISPLAY is not set
+  # ui-tester:
+  #   # pass custom command to start Cypress otherwise it will use the entrypoint
+  #   # specified in the Cypress Docker image.
+  #   # also pass "--project <folder>" so that when Cypress opens
+  #   # it can find file "cypress.json" and show integration specs
+  #   # https://on.cypress.io/command-line#cypress-open
+  #   entrypoint: 'sleep infinity'
+  #   image: "docker.io/cypress/included:latest"
+  #   environment:
+  #     - SHELL=/bin/bash
+  #     # get the IP address of the host machine and allow X11 to accept
+  #     # incoming connections from that IP address
+  #     #   IP=$(ipconfig getifaddr en0) or mac or \
+  #     #   IP=$($(hostname -I | awk '{print $1}') )  for Ubuntu
+  #     #   /usr/X11/bin/xhost + $IP
+  #     # then pass the environment variable DISPLAY to show Cypress GUI on the host system
+  #     #   DISPLAY=$IP:0
+  #     - DISPLAY
+  #   volumes:
+  #     # for Cypress to communicate with the X11 server pass this socket file
+  #     # in addition to any other mapped volumes
+  #     - /tmp/.X11-unix:/tmp/.X11-unix
+  #     - ..:/workspace:z,cached
+  #   network_mode: "host"
 volumes:
   mariadb-data:
-  postgresql-data:
+  #postgresql-data:
+  #mailpit-data:

development/apps-example.json

@@ -0,0 +1,6 @@
+[
+  {
+    "url": "https://github.com/frappe/erpnext.git",
+    "branch": "version-15"
+  }
+]

development/installer.py

@@ -0,0 +1,245 @@
+#!/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-15",  # noqa: E501
+        default="version-15",
+    )
+    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
+    )
+    parser.add_argument(
+        "-a",
+        "--admin-password",
+        action="store",
+        type=str,
+        help="admin password for site, default: admin",  # noqa: E501
+        default="admin",
+    )
+    parser.add_argument(
+        "-d",
+        "--db-type",
+        action="store",
+        type=str,
+        help="Database type to use (e.g., mariadb or postgres)",
+        default="mariadb",  # Set your default database type here
+    )
+    return parser
+
+
+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", level=3)
+        if args.db_type:
+            cprint(f"Setting db_type to {args.db_type}", level=3)
+            subprocess.call(
+                ["bench", "set-config", "-g", "db_type", args.db_type],
+                cwd=os.path.join(os.getcwd(), args.bench_name),
+            )
+
+        cprint("Set redis_cache to redis://redis-cache:6379", level=3)
+        subprocess.call(
+            [
+                "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-queue:6379 for backward compatibility",  # noqa: E501
+            level=3,
+        )
+        subprocess.call(
+            [
+                "bench",
+                "set-config",
+                "-g",
+                "redis_socketio",
+                "redis://redis-queue:6379",
+            ],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+        cprint("Set developer_mode", level=3)
+        subprocess.call(
+            ["bench", "set-config", "-gp", "developer_mode", "1"],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+    except subprocess.CalledProcessError as e:
+        cprint(e.output, level=1)
+
+
+def create_site_in_bench(args):
+    if "mariadb" == args.db_type:
+        cprint("Set db_host", level=3)
+        subprocess.call(
+            ["bench", "set-config", "-g", "db_host", "mariadb"],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+        new_site_cmd = [
+            "bench",
+            "new-site",
+            f"--db-root-username=root",
+            f"--db-host=mariadb",  # Should match the compose service name
+            f"--db-type={args.db_type}",  # Add the selected database type
+            f"--mariadb-user-host-login-scope=%",
+            f"--db-root-password=123",  # Replace with your MariaDB password
+            f"--admin-password={args.admin_password}",
+        ]
+    else:
+        cprint("Set db_host", level=3)
+        subprocess.call(
+            ["bench", "set-config", "-g", "db_host", "postgresql"],
+            cwd=os.getcwd() + "/" + args.bench_name,
+        )
+        new_site_cmd = [
+            "bench",
+            "new-site",
+            f"--db-root-username=root",
+            f"--db-host=postgresql",  # Should match the compose service name
+            f"--db-type={args.db_type}",  # Add the selected database type
+            f"--db-root-password=123",  # Replace with your PostgreSQL password
+            f"--admin-password={args.admin_password}",
+        ]
+    apps = os.listdir(f"{os.getcwd()}/{args.bench_name}/apps")
+    apps.remove("frappe")
+    for app in apps:
+        new_site_cmd.append(f"--install-app={app}")
+    new_site_cmd.append(args.site_name)
+    cprint(f"Creating Site {args.site_name} ...", level=2)
+    subprocess.call(
+        new_site_cmd,
+        cwd=os.getcwd() + "/" + args.bench_name,
+    )
+
+
+if __name__ == "__main__":
+    main()

development/vscode-example/launch.json

@@ -23,18 +23,6 @@
         "DEV_SERVER": "1"
       }
     },
-    {
-      "name": "Bench Default Worker",
-      "type": "python",
-      "request": "launch",
-      "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py",
-      "args": ["frappe", "worker", "--queue", "default"],
-      "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python",
-      "cwd": "${workspaceFolder}/frappe-bench/sites",
-      "env": {
-        "DEV_SERVER": "1"
-      }
-    },
     {
       "name": "Bench Short Worker",
       "type": "python",

development/vscode-example/settings.json

@@ -0,0 +1,3 @@
+{
+  "python.defaultInterpreterPath": "${workspaceFolder}/frappe-bench/env/bin/python"
+}

docker-bake.hcl

@@ -5,6 +5,13 @@ variable "REGISTRY_USER" {
     default = "frappe"
 }
 
+variable PYTHON_VERSION {
+    default = "3.11.6"
+}
+variable NODE_VERSION {
+    default = "18.18.2"
+}
+
 variable "FRAPPE_VERSION" {
     default = "develop"
 }
@@ -25,6 +32,10 @@ variable "BENCH_REPO" {
     default = "https://github.com/frappe/bench"
 }
 
+variable "LATEST_BENCH_RELEASE" {
+    default = "latest"
+}
+
 # Bench image
 
 target "bench" {
@@ -33,7 +44,10 @@ target "bench" {
     }
     context = "images/bench"
     target = "bench"
-    tags = ["frappe/bench:latest"]
+    tags = [
+        "frappe/bench:${LATEST_BENCH_RELEASE}",
+        "frappe/bench:latest",
+    ]
 }
 
 target "bench-test" {
@@ -44,77 +58,56 @@ target "bench-test" {
 # Main images
 # Base for all other targets
 
-group "frappe" {
-    targets = ["frappe-worker", "frappe-nginx", "frappe-socketio", "assets-builder"]
-}
-
-group "erpnext" {
-    targets = ["erpnext-worker", "erpnext-nginx"]
-}
-
 group "default" {
-    targets = ["frappe", "erpnext"]
+    targets = ["erpnext", "base", "build"]
 }
 
 function "tag" {
     params = [repo, version]
     result = [
+      # Push frappe or erpnext branch as tag
+      "${REGISTRY_USER}/${repo}:${version}",
       # If `version` param is develop (development build) then use tag `latest`
       "${version}" == "develop" ? "${REGISTRY_USER}/${repo}:latest" : "${REGISTRY_USER}/${repo}:${version}",
       # Make short tag for major version if possible. For example, from v13.16.0 make v13.
       can(regex("(v[0-9]+)[.]", "${version}")) ? "${REGISTRY_USER}/${repo}:${regex("(v[0-9]+)[.]", "${version}")[0]}" : "",
+      # Make short tag for major version if possible. For example, from v13.16.0 make version-13.
+      can(regex("(v[0-9]+)[.]", "${version}")) ? "${REGISTRY_USER}/${repo}:version-${regex("([0-9]+)[.]", "${version}")[0]}" : "",
     ]
 }
 
 target "default-args" {
     args = {
-        FRAPPE_REPO = "${FRAPPE_REPO}"
-        ERPNEXT_REPO = "${ERPNEXT_REPO}"
+        FRAPPE_PATH = "${FRAPPE_REPO}"
+        ERPNEXT_PATH = "${ERPNEXT_REPO}"
         BENCH_REPO = "${BENCH_REPO}"
-        FRAPPE_VERSION = "${FRAPPE_VERSION}"
-        ERPNEXT_VERSION = "${ERPNEXT_VERSION}"
-        # 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"
+        FRAPPE_BRANCH = "${FRAPPE_VERSION}"
+        ERPNEXT_BRANCH = "${ERPNEXT_VERSION}"
+        PYTHON_VERSION = "${PYTHON_VERSION}"
+        NODE_VERSION = "${NODE_VERSION}"
     }
 }
 
-target "frappe-worker" {
+target "erpnext" {
     inherits = ["default-args"]
-    context = "images/worker"
-    target = "frappe"
-    tags = tag("frappe-worker", "${FRAPPE_VERSION}")
-}
-
-target "erpnext-worker" {
-    inherits = ["default-args"]
-    context = "images/worker"
+    context = "."
+    dockerfile = "images/production/Containerfile"
     target = "erpnext"
-    tags =  tag("erpnext-worker", "${ERPNEXT_VERSION}")
+    tags = tag("erpnext", "${ERPNEXT_VERSION}")
 }
 
-target "frappe-nginx" {
+target "base" {
     inherits = ["default-args"]
-    context = "images/nginx"
-    target = "frappe"
-    tags =  tag("frappe-nginx", "${FRAPPE_VERSION}")
+    context = "."
+    dockerfile = "images/production/Containerfile"
+    target = "base"
+    tags = tag("base", "${FRAPPE_VERSION}")
 }
 
-target "assets-builder" {
-  inherits = ["default-args"]
-  context = "images/nginx"
-  target = "assets_builder"
-  tags = tag("assets-builder", "${FRAPPE_VERSION}")
-}
-
-target "erpnext-nginx" {
+target "build" {
     inherits = ["default-args"]
-    context = "images/nginx"
-    target = "erpnext"
-    tags =  tag("erpnext-nginx", "${ERPNEXT_VERSION}")
-}
-
-target "frappe-socketio" {
-    inherits = ["default-args"]
-    context = "images/socketio"
-    tags =  tag("frappe-socketio", "${FRAPPE_VERSION}")
+    context = "."
+    dockerfile = "images/production/Containerfile"
+    target = "build"
+    tags = tag("build", "${ERPNEXT_VERSION}")
 }

docs/backup-and-push-cronjob.md

@@ -5,40 +5,36 @@ Create backup service or stack.
 version: "3.7"
 services:
   backup:
-    image: frappe/erpnext-worker:v14
+    image: frappe/erpnext:${VERSION}
     entrypoint: ["bash", "-c"]
-    command: |
-      for SITE in $(/home/frappe/frappe-bench/env/bin/python -c "import frappe;print(' '.join(frappe.utils.get_sites()))")
-      do
-        bench --site $SITE backup --with-files
-        push-backup \
-          --site $SITE \
-          --bucket $BUCKET_NAME \
-          --region-name $REGION \
-          --endpoint-url $ENDPOINT_URL \
-          --aws-access-key-id $ACCESS_KEY_ID \
-          --aws-secret-access-key $SECRET_ACCESS_KEY
-      done
+    command:
+      - |
+        bench --site all backup
+        ## Uncomment for restic snapshots.
+        # restic snapshots || restic init
+        # restic backup sites
+        ## Uncomment to keep only last n=30 snapshots.
+        # restic forget --group-by=paths --keep-last=30 --prune
     environment:
-      - BUCKET_NAME=erpnext
-      - REGION=us-east-1
-      - ACCESS_KEY_ID=RANDOMACCESSKEY
-      - SECRET_ACCESS_KEY=RANDOMSECRETKEY
-      - ENDPOINT_URL=https://endpoint.url
+      # Set correct environment variables for restic
+      - RESTIC_REPOSITORY=s3:https://s3.endpoint.com/restic
+      - AWS_ACCESS_KEY_ID=access_key
+      - AWS_SECRET_ACCESS_KEY=secret_access_key
+      - RESTIC_PASSWORD=restic_password
     volumes:
-      - "sites-vol:/home/frappe/frappe-bench/sites"
+      - "sites:/home/frappe/frappe-bench/sites"
     networks:
       - erpnext-network
 
 networks:
   erpnext-network:
     external: true
-    name: <your_frappe_docker_project_name>_default
+    name: ${PROJECT_NAME:-erpnext}_default
 
 volumes:
-  sites-vol:
+  sites:
     external: true
-    name: <your_frappe_docker_project_name>_sites-vol
+    name: ${PROJECT_NAME:-erpnext}_sites
 ```
 
 In case of single docker host setup, add crontab entry for backup every 6 hours.
@@ -47,6 +43,16 @@ In case of single docker host setup, add crontab entry for backup every 6 hours.
 0 */6 * * * /usr/local/bin/docker-compose -f /path/to/backup-job.yml up -d > /dev/null
 ```
 
+Or
+
+```
+0 */6 * * * docker compose -p erpnext exec backend bench --site all backup --with-files > /dev/null
+```
+
 Notes:
 
+- Make sure `docker-compose` or `docker compose` is available in path during execution.
 - Change the cron string as per need.
+- Set the correct project name in place of `erpnext`.
+- For Docker Swarm add it as a [swarm-cronjob](https://github.com/crazy-max/swarm-cronjob)
+- Add it as a `CronJob` in case of Kubernetes cluster.

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": {

docs/custom-apps-podman.md

@@ -0,0 +1,125 @@
+## Prerequisites
+
+- podman
+- podman-compose
+- docker-compose
+
+Podman (the POD MANager) is a tool for managing containers and images, volumes mounted into those containers, and pods made from groups of containers. It is available on the official repositories of many Linux distributions.
+
+## Step 1
+
+- Clone this repository and change the current directory to the downloaded folder
+  ```cmd
+    git clone https://github.com/frappe/frappe_docker
+    cd frappe_docker
+  ```
+
+## Step 2
+
+- Create `apps.json` file with custom apps listed in it
+  ```json
+  [
+    {
+      "url": "https://github.com/frappe/erpnext",
+      "branch": "version-15"
+    },
+    {
+      "url": "https://github.com/frappe/hrms",
+      "branch": "version-15"
+    },
+    {
+      "url": "https://github.com/frappe/helpdesk",
+      "branch": "main"
+    }
+  ]
+  ```
+  Check the syntax of the file using `jq empty apps.json`
+  ### Generate base64 string from JSON file:
+  `cmd export APPS_JSON_BASE64=$(base64 -w 0 apps.json)`
+
+## Step 3
+
+- Building the custom image using podman
+
+```ruby
+  podman build \
+   --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \
+   --build-arg=FRAPPE_BRANCH=version-15 \
+   --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \
+   --tag=custom:15 \
+   --file=images/layered/Containerfile .
+```
+
+### Note
+
+- Make sure to use the same tag when you export a variable on the next step
+
+## Step 4
+
+- Using the image
+- Export environment variables with image name, tag and pull_policy
+  ```ruby
+      export CUSTOM_IMAGE=custom
+      export CUSTOM_TAG=15
+      export PULL_POLICY=never
+  ```
+- Configuration of parameters used when starting the containers
+  - create `.env` file copying from example.env (Read more on setting up environment variables [here](https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md)
+
+## Final step
+
+- Creating a compose file
+- ```ruby
+   podman compose -f compose.yaml \
+  -f overrides/compose.mariadb.yaml \
+  -f overrides/compose.redis.yaml \
+  -f overrides/compose.noproxy.yaml \
+  config > ./docker-compose.yml
+  ```
+  ### NOTE
+  - podman compose is just a wrapper, it uses docker-compose if it is available or podman-compose if not. podman-compose have an issue reading .env files ([Issue](https://github.com/containers/podman-compose/issues/475)) and might create an issue when running the containers.
+- Creating pod and starting the containers
+  - `podman-compose --in-pod=1 --project-name erpnext -f ./docker-compose.yml up -d`
+
+## Creating sites and installing apps
+
+- You can create sites from the backend container
+  - `podman exec -ti erpnext_backend_1 /bin/bash`
+    - `bench new-site myerp.net --mariadb-root-password 123456 --admin-password 123123`
+    - `bench --site myerp.net install-app erpnext`
+
+## Autostart pod
+
+- Systemd is the best option on autostart pods when the system boots. Create a unit file in either `/etc/systemd/system` [for root user] or `~/.config/systemd/user` [for non-root user]
+
+  ```ruby
+    [Unit]
+    Description=Podman system daemon service
+    After=network-online.target
+
+    [Service]
+    #User=
+    #Group=
+    Type=oneshot
+    ExecStart=podman pod start POD_NAME
+
+
+    [Install]
+    WantedBy=default.target
+
+  ```
+
+  **Note:** Replace POD_NAME with a created pod name while creating a pod. This is a basic systemd unit file to autostart pod, but multiple options can be used, refer to the man page for [systemd](https://man7.org/linux/man-pages/man1/init.1.html). For better management of containers, [Quadlet](https://docs.podman.io/en/v4.4/markdown/podman-systemd.unit.5.html) is the best option for ease of updating and tracing issues on each container.
+
+## Troubleshoot
+
+- If there is a network issue while building the image, you need to remove caches and restart again
+
+  - `podman system reset`
+  - `sudo rm -rf ~/.local/share/containers/ /var/lib/container ~/.caches/containers`
+
+- Database issue when restarting the container
+  - Execute the following commands from **backend** container
+  - `mysql -uroot -padmin -hdb` (Note: put your db password in place of _admin_).
+  - `SELECT User, Host FROM mysql.user;`
+  - Change the IP address to %, e.g. `RENAME USER '_5e5899d8398b5f7b'@'172.18.0.7' TO '_5e5899d8398b5f7b'@'%'`

docs/custom-apps.md

@@ -0,0 +1,156 @@
+### Load custom apps through apps.json file
+
+Base64 encoded string of `apps.json` file needs to be passed in as build arg environment variable.
+
+Create the following `apps.json` file:
+
+```json
+[
+  {
+    "url": "https://github.com/frappe/erpnext",
+    "branch": "version-15"
+  },
+  {
+    "url": "https://github.com/frappe/payments",
+    "branch": "version-15"
+  },
+  {
+    "url": "https://{{ PAT }}@git.example.com/project/repository.git",
+    "branch": "main"
+  }
+]
+```
+
+Note:
+
+- The `url` needs to be http(s) git url with personal access tokens without username eg:- `http://{{PAT}}@github.com/project/repository.git` in case of private repo.
+- Add dependencies manually in `apps.json` e.g. add `erpnext` if you are installing `hrms`.
+- Use fork repo or branch for ERPNext in case you need to use your fork or test a PR.
+
+Generate base64 string from json file:
+
+```shell
+export APPS_JSON_BASE64=$(base64 -w 0 /path/to/apps.json)
+```
+
+Test the Previous Step: Decode the Base64-encoded Environment Variable
+
+To verify the previous step, decode the `APPS_JSON_BASE64` environment variable (which is Base64-encoded) into a JSON file. Follow the steps below:
+
+1. Use the following command to decode and save the output into a JSON file named apps-test-output.json:
+
+```shell
+echo -n ${APPS_JSON_BASE64} | base64 -d > apps-test-output.json
+```
+
+2. Open the apps-test-output.json file to review the JSON output and ensure that the content is correct.
+
+### Clone frappe_docker and switch directory
+
+```shell
+git clone https://github.com/frappe/frappe_docker
+cd frappe_docker
+```
+
+### Configure build
+
+Common build args.
+
+- `FRAPPE_PATH`, customize the source repo for frappe framework. Defaults to `https://github.com/frappe/frappe`
+- `FRAPPE_BRANCH`, customize the source repo branch for frappe framework. Defaults to `version-15`.
+- `APPS_JSON_BASE64`, correct base64 encoded JSON string generated from `apps.json` file.
+
+Notes
+
+- Use `buildah` or `docker` as per your setup.
+- Make sure `APPS_JSON_BASE64` variable has correct base64 encoded JSON string. It is consumed as build arg, base64 encoding ensures it to be friendly with environment variables. Use `jq empty apps.json` to validate `apps.json` file.
+- Make sure the `--tag` is valid image name that will be pushed to registry. See section [below](#use-images) for remarks about its use.
+- `.git` directories for all apps are removed from the image.
+
+### Quick build image
+
+This method uses pre-built `frappe/base:${FRAPPE_BRANCH}` and `frappe/build:${FRAPPE_BRANCH}` image layers which come with required Python and NodeJS runtime. It speeds up the build time.
+
+It uses `images/layered/Containerfile`.
+
+```shell
+docker build \
+  --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \
+  --build-arg=FRAPPE_BRANCH=version-15 \
+  --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \
+  --tag=ghcr.io/user/repo/custom:1.0.0 \
+  --file=images/layered/Containerfile .
+```
+
+### Custom build image
+
+This method builds the base and build layer every time, it allows to customize Python and NodeJS runtime versions. It takes more time to build.
+
+It uses `images/custom/Containerfile`.
+
+```shell
+docker build \
+  --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \
+  --build-arg=FRAPPE_BRANCH=version-15 \
+  --build-arg=PYTHON_VERSION=3.11.9 \
+  --build-arg=NODE_VERSION=18.20.2 \
+  --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \
+  --tag=ghcr.io/user/repo/custom:1.0.0 \
+  --file=images/custom/Containerfile .
+```
+
+Custom build args,
+
+- `PYTHON_VERSION`, use the specified python version for base image. Default is `3.11.6`.
+- `NODE_VERSION`, use the specified nodejs version, Default `18.18.2`.
+- `DEBIAN_BASE` use the base Debian version, defaults to `bookworm`.
+- `WKHTMLTOPDF_VERSION`, use the specified qt patched `wkhtmltopdf` version. Default is `0.12.6.1-3`.
+- `WKHTMLTOPDF_DISTRO`, use the specified distro for debian package. Default is `bookworm`.
+
+### Push image to use in yaml files
+
+Login to `docker` or `buildah`
+
+```shell
+docker login
+```
+
+Push image
+
+```shell
+docker push ghcr.io/user/repo/custom:1.0.0
+```
+
+### Use Images
+
+In the [compose.yaml](../compose.yaml), you can set the image name and tag through environment variables, making it easier to customize.
+
+```yaml
+x-customizable-image: &customizable_image
+  image: ${CUSTOM_IMAGE:-frappe/erpnext}:${CUSTOM_TAG:-${ERPNEXT_VERSION:?No ERPNext version or tag set}}
+  pull_policy: ${PULL_POLICY:-always}
+```
+
+The environment variables can be set in the shell or in the .env file as [setup-options.md](setup-options.md) describes.
+
+- `CUSTOM_IMAGE`: The name of your custom image. Defaults to `frappe/erpnext` if not set.
+- `CUSTOM_TAG`: The tag for your custom image. Must be set if `CUSTOM_IMAGE` is used. Defaults to the value of `ERPNEXT_VERSION` if not set.
+- `PULL_POLICY`: The Docker pull policy. Defaults to `always`. Recommended set to `never` for local images, so prevent `docker` from trying to download the image when it has been built locally.
+- `HTTP_PUBLISH_PORT`: The port to publish through no SSL channel. Default depending on deployment, it may be `80` if SSL activated or `8080` if not.
+- `HTTPS_PUBLISH_PORT`: The secure port to publish using SSL. Default is `443`.
+
+Make sure the image name is correct before pushing to the registry. After the images are pushed, you can pull them to servers to be deployed. If the registry is private, additional auth is needed.
+
+#### Example
+
+If you built an image with the tag `ghcr.io/user/repo/custom:1.0.0`, you would set the environment variables as follows:
+
+```bash
+export CUSTOM_IMAGE='ghcr.io/user/repo/custom'
+export CUSTOM_TAG='1.0.0'
+docker compose -f compose.yaml \
+  -f overrides/compose.mariadb.yaml \
+  -f overrides/compose.redis.yaml \
+  -f overrides/compose.https.yaml \
+  config > ~/gitops/docker-compose.yaml
+```

docs/development.md

@@ -11,7 +11,12 @@ In order to start developing you need to satisfy the following prerequisites:
 It is recommended you allocate at least 4GB of RAM to docker:
 
 - [Instructions for Windows](https://docs.docker.com/docker-for-windows/#resources)
-- [Instructions for macOS](https://docs.docker.com/docker-for-mac/#resources)
+- [Instructions for macOS](https://docs.docker.com/desktop/settings/mac/#advanced)
+
+Here is a screenshot showing the relevant setting in the Help Manual
+![image](images/Docker%20Manual%20Screenshot%20-%20Resources%20section.png)
+Here is a screenshot showing the settings in Docker Desktop on Mac
+![images](images/Docker%20Desktop%20Screenshot%20-%20Resources%20section.png)
 
 ## Bootstrap Containers for development
 
@@ -36,23 +41,23 @@ cp -R development/vscode-example development/.vscode
 
 ## Use VSCode Remote Containers extension
 
-For most people getting started with Frappe development, the best solution is to use [VSCode Remote - Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers).
+For most people getting started with Frappe development, the best solution is to use [VSCode Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers).
 
 Before opening the folder in container, determine the database that you want to use. The default is MariaDB.
 If you want to use PostgreSQL instead, edit `.devcontainer/docker-compose.yml` and uncomment the section for `postgresql` service, and you may also want to comment `mariadb` as well.
 
 VSCode should automatically inquire you to install the required extensions, that can also be installed manually as follows:
 
-- Install Remote - Containers for VSCode
+- Install Dev Containers for VSCode
   - through command line `code --install-extension ms-vscode-remote.remote-containers`
-  - clicking on the Install button in the Vistual Studio Marketplace: [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
+  - clicking on the Install button in the Vistual Studio Marketplace: [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
   - View: Extensions command in VSCode (Windows: Ctrl+Shift+X; macOS: Cmd+Shift+X) then search for extension `ms-vscode-remote.remote-containers`
 
 After the extensions are installed, you can:
 
 - Open frappe_docker folder in VS Code.
   - `code .`
-- Launch the command, from Command Palette (Ctrl + Shift + P) `Remote-Containers: Reopen in Container`. You can also click in the bottom left corner to access the remote container menu.
+- Launch the command, from Command Palette (Ctrl + Shift + P) `Dev Containers: Reopen in Container`. You can also click in the bottom left corner to access the remote container menu.
 
 Notes:
 
@@ -61,24 +66,34 @@ Notes:
 
 ### Setup first bench
 
+> Jump to [scripts](#setup-bench--new-site-using-script) section to setup a bench automatically. Alternatively, you can setup a bench manually using below guide.
+
 Run the following commands in the terminal inside the container. You might need to create a new terminal in VSCode.
 
+NOTE: Prior to doing the following, make sure the user is **frappe**.
+
 ```shell
 bench init --skip-redis-config-generation frappe-bench
 cd frappe-bench
 ```
 
-For version 13 use Python 3.9 by passing option to `bench init` command,
+To setup frappe framework version 14 bench set `PYENV_VERSION` environment variable to `3.10.5` (default) and use NodeJS version 16 (default),
 
 ```shell
-bench init --skip-redis-config-generation --frappe-branch version-13 --python python3.9 frappe-bench
+# Use default environments
+bench init --skip-redis-config-generation --frappe-branch version-14 frappe-bench
+# Or set environment versions explicitly
+nvm use v16
+PYENV_VERSION=3.10.13 bench init --skip-redis-config-generation --frappe-branch version-14 frappe-bench
+# Switch directory
 cd frappe-bench
 ```
 
-For version 12 use Python 3.7 by passing option to `bench init` command,
+To setup frappe framework version 13 bench set `PYENV_VERSION` environment variable to `3.9.17` and use NodeJS version 14,
 
 ```shell
-bench init --skip-redis-config-generation --frappe-branch version-12 --python python3.7 frappe-bench
+nvm use v14
+PYENV_VERSION=3.9.17 bench init --skip-redis-config-generation --frappe-branch version-13 frappe-bench
 cd frappe-bench
 ```
 
@@ -90,7 +105,7 @@ We need to tell bench to use the right containers instead of localhost. Run the
 bench set-config -g db_host mariadb
 bench set-config -g redis_cache redis://redis-cache:6379
 bench set-config -g redis_queue redis://redis-queue:6379
-bench set-config -g redis_socketio redis://redis-socketio:6379
+bench set-config -g redis_socketio redis://redis-queue:6379
 ```
 
 For any reason the above commands fail, set the values in `common_site_config.json` manually.
@@ -100,7 +115,7 @@ For any reason the above commands fail, set the values in `common_site_config.js
   "db_host": "mariadb",
   "redis_cache": "redis://redis-cache:6379",
   "redis_queue": "redis://redis-queue:6379",
-  "redis_socketio": "redis://redis-socketio:6379"
+  "redis_socketio": "redis://redis-queue:6379"
 }
 ```
 
@@ -129,7 +144,7 @@ sed -i '/redis/d' ./Procfile
 You can create a new site with the following command:
 
 ```shell
-bench new-site sitename --no-mariadb-socket
+bench new-site --mariadb-user-host-login-scope=% sitename
 ```
 
 sitename MUST end with .localhost for trying deployments locally.
@@ -137,18 +152,18 @@ sitename MUST end with .localhost for trying deployments locally.
 for example:
 
 ```shell
-bench new-site mysite.localhost --no-mariadb-socket
+bench new-site --mariadb-user-host-login-scope=% development.localhost
 ```
 
 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 --db-root-password 123 --admin-password admin --mariadb-user-host-login-scope=% development.localhost
 ```
 
 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`.
-The option `--no-mariadb-socket` will configure site's database credentials to work with docker.
+This will create a new site and a `development.localhost` directory under `frappe-bench/sites`.
+The option `--mariadb-user-host-login-scope=%` 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.
 
 To setup site with PostgreSQL as database use option `--db-type postgres` and `--db-host postgresql`. (Available only v12 onwards, currently NOT available for ERPNext).
@@ -156,7 +171,7 @@ To setup site with PostgreSQL as database use option `--db-type postgres` and `-
 Example:
 
 ```shell
-bench new-site mypgsql.localhost --db-type postgres --db-host postgresql
+bench new-site --db-type postgres --db-host postgresql mypgsql.localhost
 ```
 
 To avoid entering postgresql username and root password, set it in `common_site_config.json`,
@@ -173,8 +188,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
@@ -188,17 +203,24 @@ 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 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-12
+Note: Both frappe and erpnext must be on branch with same name. e.g. version-14
 
 ### Start Frappe without debugging
 
@@ -209,9 +231,59 @@ 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
+
+Most developers work with numerous clients and versions. Moreover, apps may be required to be installed by everyone on the team working for a client.
+
+This is simplified using a script to automate the process of creating a new bench / site and installing the required apps. The `Administrator` password for created sites is `admin`.
+
+Sample `apps-example.json` is used by default, it installs erpnext on current stable release. To install custom apps, copy the `apps-example.json` to custom json file and make changes to list of apps. Pass this file to the `installer.py` script.
+
+> You may have apps in private repos which may require ssh access. You may use SSH from your home directory on linux (configurable in docker-compose.yml).
+
+```shell
+python installer.py  #pass --db-type postgres for postgresdb
+```
+
+For command help
+
+```shell
+python installer.py --help
+usage: installer.py [-h] [-j APPS_JSON] [-b BENCH_NAME] [-s SITE_NAME] [-r FRAPPE_REPO] [-t FRAPPE_BRANCH] [-p PY_VERSION] [-n NODE_VERSION] [-v] [-a ADMIN_PASSWORD] [-d DB_TYPE]
+
+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-15
+  -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 ADMIN_PASSWORD, --admin-password ADMIN_PASSWORD
+                        admin password for site, default: admin
+  -d DB_TYPE, --db-type DB_TYPE
+                        Database type to use (e.g., mariadb or postgres)
+```
+
+A new bench and / or site is created for the client with following defaults.
+
+- MariaDB root password: `123`
+- Admin password: `admin`
+
+> To use Postegres DB, comment the mariabdb service and uncomment postegres service.
+
 ### Start Frappe with Visual Studio Code Python Debugging
 
 To enable Python debugging inside Visual Studio Code, you must first install the `ms-python.python` extension inside the container. This should have already happened automatically, but depending on your VSCode config, you can force it by:
@@ -229,8 +301,7 @@ honcho start \
     watch \
     schedule \
     worker_short \
-    worker_long \
-    worker_default
+    worker_long
 ```
 
 Alternatively you can use the VSCode launch configuration "Honcho SocketIO Watch Schedule Worker" which launches the same command as above.
@@ -248,7 +319,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.
@@ -263,12 +334,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()
@@ -317,3 +388,30 @@ volumes:
 ```
 
 Access the service by service name from the `frappe` development container. The above service will be accessible via hostname `postgresql`. If ports are published on to host, access it via `localhost:5432`.
+
+## Using Cypress UI tests
+
+To run cypress based UI tests in a docker environment, follow the below steps:
+
+1. Install and setup X11 tooling on VM using the script `install_x11_deps.sh`
+
+```shell
+  sudo bash ./install_x11_deps.sh
+```
+
+This script will install required deps, enable X11Forwarding and restart SSH daemon and export `DISPLAY` variable.
+
+2. Run X11 service `startx` or `xquartz`
+3. Start docker compose services.
+4. SSH into ui-tester service using `docker exec..` command
+5. Export CYPRESS_baseUrl and other required env variables
+6. Start Cypress UI console by issuing `cypress run command`
+
+> More references : [Cypress Official Documentation](https://www.cypress.io/blog/2019/05/02/run-cypress-with-a-single-docker-command)
+
+> Ensure DISPLAY environment is always exported.
+
+## Using Mailpit to test mail services
+
+To use Mailpit just uncomment the service in the docker-compose.yml file.
+The Interface is then available under port 8025 and the smtp service can be used as mailpit:1025.

docs/environment-variables.md

@@ -0,0 +1,56 @@
+## Environment Variables
+
+All of the commands are directly passed to container as per type of service. Only environment variables used in image are for `nginx-entrypoint.sh` command. They are as follows:
+
+- `BACKEND`: Set to `{host}:{port}`, defaults to `0.0.0.0:8000`
+- `SOCKETIO`: Set to `{host}:{port}`, defaults to `0.0.0.0:9000`
+- `UPSTREAM_REAL_IP_ADDRESS`: Set Nginx config for [ngx_http_realip_module#set_real_ip_from](http://nginx.org/en/docs/http/ngx_http_realip_module.html#set_real_ip_from), defaults to `127.0.0.1`
+- `UPSTREAM_REAL_IP_HEADER`: Set Nginx config for [ngx_http_realip_module#real_ip_header](http://nginx.org/en/docs/http/ngx_http_realip_module.html#real_ip_header), defaults to `X-Forwarded-For`
+- `UPSTREAM_REAL_IP_RECURSIVE`: Set Nginx config for [ngx_http_realip_module#real_ip_recursive](http://nginx.org/en/docs/http/ngx_http_realip_module.html#real_ip_recursive) Set defaults to `off`
+- `FRAPPE_SITE_NAME_HEADER`: Set proxy header `X-Frappe-Site-Name` and serve site named in the header, defaults to `$host`, i.e. find site name from host header. More details [below](#frappe_site_name_header)
+- `PROXY_READ_TIMEOUT`: Upstream gunicorn service timeout, defaults to `120`
+- `CLIENT_MAX_BODY_SIZE`: Max body size for uploads, defaults to `50m`
+
+To bypass `nginx-entrypoint.sh`, mount desired `/etc/nginx/conf.d/default.conf` and run `nginx -g 'daemon off;'` as container command.
+
+## Configuration
+
+We use environment variables to configure our setup. docker-compose uses variables from the `environment:` section of the services defined within and the`.env` file, if present. Variables defined in the `.env` file are referenced via `${VARIABLE_NAME}` within the docker-compose `.yml` file. `example.env` contains a non-exhaustive list of possible configuration variables. To get started, copy `example.env` to `.env`.
+
+### `FRAPPE_VERSION`
+
+Frappe framework release. You can find all releases [here](https://github.com/frappe/frappe/releases).
+
+### `DB_PASSWORD`
+
+Password for MariaDB (or Postgres) database.
+
+### `DB_HOST`
+
+Hostname for MariaDB (or Postgres) database. Set only if external service for database is used or the container can not be reached by its service name (db) by other containers.
+
+### `DB_PORT`
+
+Port for MariaDB (3306) or Postgres (5432) database. Set only if external service for database is used.
+
+### `REDIS_CACHE`
+
+Hostname for redis server to store cache. Set only if external service for redis is used or the container can not be reached by its service name (redis-cache) by other containers.
+
+### `REDIS_QUEUE`
+
+Hostname for redis server to store queue data and socketio. Set only if external service for redis is used or the container can not be reached by its service name (redis-queue) by other containers.
+
+### `ERPNEXT_VERSION`
+
+ERPNext [release](https://github.com/frappe/erpnext/releases). This variable is required if you use ERPNext override.
+
+### `LETSENCRYPT_EMAIL`
+
+Email that used to register https certificate. This one is required only if you use HTTPS override.
+
+### `FRAPPE_SITE_NAME_HEADER`
+
+This environment variable is not required. Default value is `$$host` which resolves site by host. For example, if your host is `example.com`, site's name should be `example.com`, or if host is `127.0.0.1` (local debugging), it should be `127.0.0.1` This variable allows to override described behavior. Let's say you create site named `mysite` and do want to access it by `127.0.0.1` host. Than you would set this variable to `mysite`.
+
+There is other variables not mentioned here. They're somewhat internal and you don't have to worry about them except you want to change main compose file.

docs/error-nginx-entrypoint-windows.md

@@ -0,0 +1,12 @@
+# Resolving Docker `nginx-entrypoint.sh` Script Not Found Error on Windows
+
+If you're encountering the error `exec /usr/local/bin/nginx-entrypoint.sh: no such file or directory` in a Docker container on Windows, follow these steps to resolve the issue.
+
+## 1. Check Line Endings
+
+On Windows, files often have `CRLF` line endings, while Linux systems expect `LF`. This can cause issues when executing shell scripts in Linux containers.
+
+- **Convert Line Endings using `dos2unix`:**
+  ```bash
+  dos2unix resources/nginx-entrypoint.sh
+  ```

docs/images-and-compose-files.md

@@ -1,101 +0,0 @@
-# Images
-
-There's 4 images that you can find in `/images` directory:
-
-- `bench`. It is used for development. [Learn more how to start development](../development/README.md).
-- `nginx`. This image contains JS and CSS assets. Container using this image also routes incoming requests using [nginx](https://www.nginx.com).
-- `socketio`. Container using this image processes realtime websocket requests using [Socket.IO](https://socket.io).
-- `worker`. Multi-purpose Python backend. Runs [Werkzeug server](https://werkzeug.palletsprojects.com/en/2.0.x/) with [gunicorn](https://gunicorn.org), queues (via `bench worker`), or schedule (via `bench schedule`).
-
-> `nginx`, `socketio` and `worker` images — everything we need to be able to run all processes that Frappe framework requires (take a look at [Bench Procfile reference](https://frappeframework.com/docs/v13/user/en/bench/resources/bench-procfile)). We follow [Docker best practices](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#decouple-applications) and split these processes to different containers.
-
-> ERPNext images don't have their own Dockerfiles. We use [multi-stage builds](https://docs.docker.com/develop/develop-images/multistage-build/) and [Docker Buildx](https://docs.docker.com/engine/reference/commandline/buildx/) to reuse as much things as possible and make our builds more efficient.
-
-# Compose files
-
-After building the images we have to run the containers. The best and simplest way to do this is to use [compose files](https://docs.docker.com/compose/compose-file/).
-
-We have one main compose file, `compose.yaml`. Services described, networking, volumes are also handled there.
-
-## Services
-
-All services are described in `compose.yaml`
-
-- `configurator`. Updates `common_site_config.json` so Frappe knows how to access db and redis. It is executed on every `docker-compose up` (and exited immediately). Other services start after this container exits successfully.
-- `backend`. [Werkzeug server](https://werkzeug.palletsprojects.com/en/2.0.x/).
-- `db`. Optional service that runs [MariaDB](https://mariadb.com) if you also use `overrides/compose.mariadb.yaml` or [Postgres](https://www.postgresql.org) if you also use `overrides/compose.postgres.yaml`.
-- `redis`. Optional service that runs [Redis](https://redis.io) server with cache, [Socket.IO](https://socket.io) and queues data.
-- `frontend`. [nginx](https://www.nginx.com) server that serves JS/CSS assets and routes incoming requests.
-- `proxy`. [Traefik](https://traefik.io/traefik/) proxy. It is here for complicated setups or HTTPS override (with `overrides/compose.https.yaml`).
-- `websocket`. Node server that runs [Socket.IO](https://socket.io).
-- `queue-short`, `queue-default`, `queue-long`. Python servers that run job queues using [rq](https://python-rq.org).
-- `scheduler`. Python server that runs tasks on schedule using [schedule](https://schedule.readthedocs.io/en/stable/).
-
-## Overrides
-
-We have several [overrides](https://docs.docker.com/compose/extends/):
-
-- `overrides/compose.proxy.yaml`. Adds traefik proxy to setup.
-- `overrides/compose.noproxy.yaml`. Publishes `frontend` ports directly without any proxy.
-- `overrides/compose.erpnext.yaml`. Replaces all Frappe images with ERPNext ones. ERPNext images are built on top of Frappe ones, so it is safe to replace them.
-- `overrides/compose.https.yaml`. Automatically sets up Let's Encrypt certificate and redirects all requests to directed to http, to https.
-- `overrides/compose.mariadb.yaml`. Adds `db` service and sets its image to MariaDB.
-- `overrides/compose.postgres.yaml`. Adds `db` service and sets its image to Postgres. Note that ERPNext currently doesn't support Postgres.
-- `overrides/compose.redis.yaml`. Adds `redis` service and sets its image to `redis`.
-
-It is quite simple to run overrides. All we need to do is to specify compose files that should be used by docker-compose. For example, we want ERPNext:
-
-```bash
-# Point to main compose file (compose.yaml) and add one more.
-docker-compose -f compose.yaml -f overrides/compose.erpnext.yaml config
-```
-
-⚠ Make sure to use docker-compose v2 (run `docker-compose -v` to check). If you want to use v1 make sure the correct `$`-signs as they get duplicated by the `config` command!
-
-That's it! Of course, we also have to setup `.env` before all of that, but that's not the point.
-
-## Configuration
-
-We use environment variables to configure our setup. docker-compose uses variables from `.env` file. To get started, copy `example.env` to `.env`.
-
-### `FRAPPE_VERSION`
-
-Frappe framework release. You can find all releases [here](https://github.com/frappe/frappe/releases).
-
-### `DB_PASSWORD`
-
-Password for MariaDB (or Postgres) database.
-
-### `DB_HOST`
-
-Hostname for MariaDB (or Postgres) database. Set only if external service for database is used.
-
-### `DB_PORT`
-
-Port for MariaDB (3306) or Postgres (5432) database. Set only if external service for database is used.
-
-### `REDIS_CACHE`
-
-Hostname for redis server to store cache. Set only if external service for redis is used.
-
-### `REDIS_QUEUE`
-
-Hostname for redis server to store queue data. Set only if external service for redis is used.
-
-### `REDIS_SOCKETIO`
-
-Hostname for redis server to store socketio data. Set only if external service for redis is used.
-
-### `ERPNEXT_VERSION`
-
-ERPNext [release](https://github.com/frappe/frappe/releases). This variable is required if you use ERPNext override.
-
-### `LETSENCRYPT_EMAIL`
-
-Email that used to register https certificate. This one is required only if you use HTTPS override.
-
-### `FRAPPE_SITE_NAME_HEADER`
-
-This environment variable is not required. Default value is `$$host` which resolves site by host. For example, if your host is `example.com`, site's name should be `example.com`, or if host is `127.0.0.1` (local debugging), it should be `127.0.0.1` This variable allows to override described behavior. Let's say you create site named `mysite` and do want to access it by `127.0.0.1` host. Than you would set this variable to `mysite`.
-
-There is other variables not mentioned here. They're somewhat internal and you don't have to worry about them except you want to change main compose file.

docs/list-of-containers.md

@@ -0,0 +1,58 @@
+# Images
+
+There are 3 images that you can find in `/images` directory:
+
+- `bench`. It is used for development. [Learn more how to start development](development.md).
+- `production`.
+  - Multi-purpose Python backend. Runs [Werkzeug server](https://werkzeug.palletsprojects.com/en/2.0.x/) with [gunicorn](https://gunicorn.org), queues (via `bench worker`), or schedule (via `bench schedule`).
+  - Contains JS and CSS assets and routes incoming requests using [nginx](https://www.nginx.com).
+  - Processes realtime websocket requests using [Socket.IO](https://socket.io).
+- `custom`. It is used to build bench using `apps.json` file set with `--apps_path` during bench initialization. `apps.json` is a json array. e.g. `[{"url":"{{repo_url}}","branch":"{{repo_branch}}"}]`
+
+Image has everything we need to be able to run all processes that Frappe framework requires (take a look at [Bench Procfile reference](https://frappeframework.com/docs/v14/user/en/bench/resources/bench-procfile)). We follow [Docker best practices](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#decouple-applications) and split these processes to different containers.
+
+> We use [multi-stage builds](https://docs.docker.com/develop/develop-images/multistage-build/) and [Docker Buildx](https://docs.docker.com/engine/reference/commandline/buildx/) to reuse as much things as possible and make our builds more efficient.
+
+# Compose files
+
+After building the images we have to run the containers. The best and simplest way to do this is to use [compose files](https://docs.docker.com/compose/compose-file/).
+
+We have one main compose file, `compose.yaml`. Services described, networking, volumes are also handled there.
+
+## Services
+
+All services are described in `compose.yaml`
+
+- `configurator`. Updates `common_site_config.json` so Frappe knows how to access db and redis. It is executed on every `docker-compose up` (and exited immediately). Other services start after this container exits successfully.
+- `backend`. [Werkzeug server](https://werkzeug.palletsprojects.com/en/2.0.x/).
+- `db`. Optional service that runs [MariaDB](https://mariadb.com) if you also use `overrides/compose.mariadb.yaml` or [Postgres](https://www.postgresql.org) if you also use `overrides/compose.postgres.yaml`.
+- `redis`. Optional service that runs [Redis](https://redis.io) server with cache, [Socket.IO](https://socket.io) and queues data.
+- `frontend`. [nginx](https://www.nginx.com) server that serves JS/CSS assets and routes incoming requests.
+- `proxy`. [Traefik](https://traefik.io/traefik/) proxy. It is here for complicated setups or HTTPS override (with `overrides/compose.https.yaml`).
+- `websocket`. Node server that runs [Socket.IO](https://socket.io).
+- `queue-short`, `queue-long`. Python servers that run job queues using [rq](https://python-rq.org).
+- `scheduler`. Python server that runs tasks on schedule using [schedule](https://schedule.readthedocs.io/en/stable/).
+
+## Overrides
+
+We have several [overrides](https://docs.docker.com/compose/extends/):
+
+- `overrides/compose.proxy.yaml`. Adds traefik proxy to setup.
+- `overrides/compose.noproxy.yaml`. Publishes `frontend` ports directly without any proxy.
+- `overrides/compose.https.yaml`. Automatically sets up Let's Encrypt certificate and redirects all requests to directed to http, to https.
+- `overrides/compose.mariadb.yaml`. Adds `db` service and sets its image to MariaDB.
+- `overrides/compose.postgres.yaml`. Adds `db` service and sets its image to Postgres. Note that ERPNext currently doesn't support Postgres.
+- `overrides/compose.redis.yaml`. Adds `redis` service and sets its image to `redis`.
+
+It is quite simple to run overrides. All we need to do is to specify compose files that should be used by docker-compose. For example, we want ERPNext:
+
+```bash
+# Point to main compose file (compose.yaml) and add one more.
+docker-compose -f compose.yaml -f overrides/compose.redis.yaml config
+```
+
+⚠ Make sure to use docker-compose v2 (run `docker-compose -v` to check). If you want to use v1 make sure the correct `$`-signs as they get duplicated by the `config` command!
+
+That's it! Of course, we also have to setup `.env` before all of that, but that's not the point.
+
+Check [environment variables](environment-variables.md) for more.

docs/migrate-from-multi-image-setup.md

@@ -0,0 +1,112 @@
+## Migrate from multi-image setup
+
+All the containers now use same image. Use `frappe/erpnext` instead of `frappe/frappe-worker`, `frappe/frappe-nginx` , `frappe/frappe-socketio` , `frappe/erpnext-worker` and `frappe/erpnext-nginx`.
+
+Now you need to specify command and environment variables for following containers:
+
+### Frontend
+
+For `frontend` service to act as static assets frontend and reverse proxy, you need to pass `nginx-entrypoint.sh` as container `command` and `BACKEND` and `SOCKETIO` environment variables pointing `{host}:{port}` for gunicorn and websocket services. Check [environment variables](environment-variables.md)
+
+Now you only need to mount the `sites` volume at location `/home/frappe/frappe-bench/sites`. No need for `assets` volume and asset population script or steps.
+
+Example change:
+
+```yaml
+# ... removed for brevity
+frontend:
+  image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set}
+  command:
+    - nginx-entrypoint.sh
+  environment:
+    BACKEND: backend:8000
+    SOCKETIO: websocket:9000
+  volumes:
+    - sites:/home/frappe/frappe-bench/sites
+# ... removed for brevity
+```
+
+### Websocket
+
+For `websocket` service to act as socketio backend, you need to pass `["node", "/home/frappe/frappe-bench/apps/frappe/socketio.js"]` as container `command`
+
+Example change:
+
+```yaml
+# ... removed for brevity
+websocket:
+  image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set}
+  command:
+    - node
+    - /home/frappe/frappe-bench/apps/frappe/socketio.js
+# ... removed for brevity
+```
+
+### Configurator
+
+For `configurator` service to act as run once configuration job, you need to pass `["bash", "-c"]` as container `entrypoint` and bash script inline to yaml. There is no `configure.py` in the container now.
+
+Example change:
+
+```yaml
+# ... removed for brevity
+configurator:
+  image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set}
+  restart: "no"
+  entrypoint:
+    - bash
+    - -c
+  command:
+    - >
+      bench set-config -g db_host $$DB_HOST;
+      bench set-config -gp db_port $$DB_PORT;
+      bench set-config -g redis_cache "redis://$$REDIS_CACHE";
+      bench set-config -g redis_queue "redis://$$REDIS_QUEUE";
+      bench set-config -gp socketio_port $$SOCKETIO_PORT;
+  environment:
+    DB_HOST: db
+    DB_PORT: "3306"
+    REDIS_CACHE: redis-cache:6379
+    REDIS_QUEUE: redis-queue:6379
+    SOCKETIO_PORT: "9000"
+# ... removed for brevity
+```
+
+### Site Creation
+
+For `create-site` service to act as run once site creation job, you need to pass `["bash", "-c"]` as container `entrypoint` and bash script inline to yaml. Make sure to use `--mariadb-user-host-login-scope=%` as upstream bench is installed in container.
+
+The `WORKDIR` has changed to `/home/frappe/frappe-bench` like `bench` setup we are used to. So the path to find `common_site_config.json` has changed to `sites/common_site_config.json`.
+
+Example change:
+
+```yaml
+# ... removed for brevity
+create-site:
+  image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set}
+  restart: "no"
+  entrypoint:
+    - bash
+    - -c
+  command:
+    - >
+      wait-for-it -t 120 db:3306;
+      wait-for-it -t 120 redis-cache:6379;
+      wait-for-it -t 120 redis-queue:6379;
+      export start=`date +%s`;
+      until [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".db_host // empty"` ]] && \
+        [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_cache // empty"` ]] && \
+        [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_queue // empty"` ]];
+      do
+        echo "Waiting for sites/common_site_config.json to be created";
+        sleep 5;
+        if (( `date +%s`-start > 120 )); then
+          echo "could not find sites/common_site_config.json with required keys";
+          exit 1
+        fi
+      done;
+      echo "sites/common_site_config.json found";
+      bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend;
+
+# ... removed for brevity
+```

docs/patch-code-from-images.md

@@ -1,34 +0,0 @@
-Example: https://discuss.erpnext.com/t/sms-two-factor-authentication-otp-msg-change/47835
-
-Above example needs following Dockerfile based patch
-
-```Dockerfile
-FROM frappe/erpnext-worker:v12.17.0
-
-...
-USER root
-RUN sed -i -e "s/Your verification code is/আপনার লগইন কোড/g" /home/frappe/frappe-bench/apps/frappe/frappe/twofactor.py
-USER frappe
-...
-
-```
-
-Example for `nginx` image,
-
-```Dockerfile
-FROM frappe/erpnext-nginx:v13.27.0
-
-# Hack to use Frappe/ERPNext offline.
-RUN sed -i 's/navigator.onLine/navigator.onLine||true/' \
-  /usr/share/nginx/html/assets/js/desk.min.js \
-  /usr/share/nginx/html/assets/js/dialog.min.js \
-  /usr/share/nginx/html/assets/js/frappe-web.min.js
-```
-
-Alternatively copy the modified source code file directly over `/home/frappe/frappe-bench/apps/frappe/frappe/twofactor.py`
-
-```Dockerfile
-...
-COPY twofactor.py /home/frappe/frappe-bench/apps/frappe/frappe/twofactor.py
-...
-```

docs/port-based-multi-tenancy.md

@@ -6,43 +6,64 @@ Remove the traefik service from docker-compose.yml
 
 ### Step 2
 
-Create nginx config file `/opt/nginx/conf/serve-8001.conf`:
+Add service for each port that needs to be exposed.
 
-```
-server {
-	listen 8001;
-	server_name $http_host;
+e.g. `port-site-1`, `port-site-2`, `port-site-3`.
 
-	location / {
-
- 		rewrite ^(.+)/$ $1 permanent;
-  		rewrite ^(.+)/index\.html$ $1 permanent;
-  		rewrite ^(.+)\.html$ $1 permanent;
-
-		proxy_set_header X-Frappe-Site-Name mysite.localhost;
-		proxy_set_header Host mysite.localhost;
-		proxy_pass  http://frontend;
-	}
-}
+```yaml
+# ... removed for brevity
+services:
+	# ... removed for brevity
+  port-site-1:
+    image: frappe/erpnext:v14.11.1
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - nginx-entrypoint.sh
+    environment:
+      BACKEND: backend:8000
+      FRAPPE_SITE_NAME_HEADER: site1.local
+      SOCKETIO: websocket:9000
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+    ports:
+      - "8080:8080"
+  port-site-2:
+    image: frappe/erpnext:v14.11.1
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - nginx-entrypoint.sh
+    environment:
+      BACKEND: backend:8000
+      FRAPPE_SITE_NAME_HEADER: site2.local
+      SOCKETIO: websocket:9000
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+    ports:
+      - "8081:8080"
+  port-site-3:
+    image: frappe/erpnext:v14.11.1
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - nginx-entrypoint.sh
+    environment:
+      BACKEND: backend:8000
+      FRAPPE_SITE_NAME_HEADER: site3.local
+      SOCKETIO: websocket:9000
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+    ports:
+      - "8082:8080"
 ```
 
 Notes:
 
-- Replace the port with any port of choice e.g. `listen 4200;`
-- Change `mysite.localhost` to site name
-- Repeat the server blocks for multiple ports and site names to get the effect of port based multi tenancy
-- For old images use `proxy_pass http://erpnext-nginx` instead of `proxy_pass http://frontend`
-
-### Step 3
-
-Run the docker container
-
-```shell
-docker run --network=<project-name>_default \
-  -p 8001:8001 \
-  --volume=/opt/nginx/conf/serve-8001.conf:/etc/nginx/conf.d/default.conf -d nginx
-```
-
-Note: Change the volumes, network and ports as needed
-
-With the above example configured site will be accessible on `http://localhost:8001`
+- Above setup will expose `site1.local`, `site2.local`, `site3.local` on port `8080`, `8081`, `8082` respectively.
+- Change `site1.local` to site name to serve from bench.
+- Change the `BACKEND` and `SOCKETIO` environment variables as per your service names.
+- Make sure `sites:` volume is available as part of yaml.

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
 
@@ -40,8 +40,7 @@ Instead of `docker compose config`, you can directly use `docker compose up` to
 
 ### Setup Frappe without proxy and external MariaDB and Redis
 
-In this case make sure you've set `DB_HOST`, `DB_PORT`, `REDIS_CACHE`, `REDIS_QUEUE` and `REDIS_SOCKETIO`
-environment variables or the `configurator` will fail.
+In this case make sure you've set `DB_HOST`, `DB_PORT`, `REDIS_CACHE` and `REDIS_QUEUE` environment variables or the `configurator` will fail.
 
 ```sh
 # Generate YAML
@@ -53,14 +52,12 @@ docker compose --project-name <project-name> -f ~/gitops/docker-compose.yml up -
 
 ### Setup ERPNext with proxy and external MariaDB and Redis
 
-In this case make sure you've set `DB_HOST`, `DB_PORT`, `REDIS_CACHE`, `REDIS_QUEUE` and `REDIS_SOCKETIO`
-environment variables or the `configurator` will fail.
+In this case make sure you've set `DB_HOST`, `DB_PORT`, `REDIS_CACHE` and `REDIS_QUEUE` environment variables or the `configurator` will fail.
 
 ```sh
 # Generate YAML
 docker compose -f compose.yaml \
   -f overrides/compose.proxy.yaml \
-  -f overrides/compose.erpnext.yaml \
   config > ~/gitops/docker-compose.yml
 
 # Start containers
@@ -69,6 +66,8 @@ docker compose --project-name <project-name> -f ~/gitops/docker-compose.yml up -
 
 ### Setup Frappe using containerized MariaDB and Redis with Letsencrypt certificates.
 
+In this case make sure you've set `LETSENCRYPT_EMAIL` and `SITES` environment variables are set or certificates won't work.
+
 ```sh
 # Generate YAML
 docker compose -f compose.yaml \
@@ -83,10 +82,11 @@ docker compose --project-name <project-name> -f ~/gitops/docker-compose.yml up -
 
 ### Setup ERPNext using containerized MariaDB and Redis with Letsencrypt certificates.
 
+In this case make sure you've set `LETSENCRYPT_EMAIL` and `SITES` environment variables are set or certificates won't work.
+
 ```sh
 # Generate YAML
 docker compose -f compose.yaml \
-  -f overrides/compose.erpnext.yaml \
   -f overrides/compose.mariadb.yaml \
   -f overrides/compose.redis.yaml \
   -f overrides/compose.https.yaml \
@@ -110,20 +110,22 @@ nano .env
 
 # Pull new images
 docker compose -f compose.yaml \
-  -f overrides/compose.erpnext.yaml \
   # ... your other overrides
   config > ~/gitops/docker-compose.yml
 
+# Pull images
 docker compose --project-name <project-name> -f ~/gitops/docker-compose.yml pull
 
 # Stop containers
 docker compose --project-name <project-name> -f ~/gitops/docker-compose.yml down
 
-# Remove assets volume for repopulation
-docker volume rm <name of assets volume>
-
 # Restart containers
 docker compose --project-name <project-name> -f ~/gitops/docker-compose.yml up -d
 ```
 
+Note:
+
+- pull and stop container commands can be skipped if immutable image tags are used
+- `docker compose up -d` will pull new immutable tags if not found.
+
 To migrate sites refer [site operations](./site-operations.md#migrate-site)

docs/setup_for_linux_mac.md

@@ -0,0 +1,226 @@
+# How to install ERPNext on linux/mac using Frappe_docker ?
+
+step1: clone the repo
+
+```
+git clone https://github.com/frappe/frappe_docker
+```
+
+step2: add platform: linux/amd64 to all services in the /pwd.yaml
+
+here is the update pwd.yml file
+
+```yml
+version: "3"
+
+services:
+  backend:
+    image: frappe/erpnext:v15
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: on-failure
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
+
+  configurator:
+    image: frappe/erpnext:v15
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: none
+    entrypoint:
+      - bash
+      - -c
+    # add redis_socketio for backward compatibility
+    command:
+      - >
+        ls -1 apps > sites/apps.txt;
+        bench set-config -g db_host $$DB_HOST;
+        bench set-config -gp db_port $$DB_PORT;
+        bench set-config -g redis_cache "redis://$$REDIS_CACHE";
+        bench set-config -g redis_queue "redis://$$REDIS_QUEUE";
+        bench set-config -g redis_socketio "redis://$$REDIS_QUEUE";
+        bench set-config -gp socketio_port $$SOCKETIO_PORT;
+    environment:
+      DB_HOST: db
+      DB_PORT: "3306"
+      REDIS_CACHE: redis-cache:6379
+      REDIS_QUEUE: redis-queue:6379
+      SOCKETIO_PORT: "9000"
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
+
+  create-site:
+    image: frappe/erpnext:v15
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: none
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
+    entrypoint:
+      - bash
+      - -c
+    command:
+      - >
+        wait-for-it -t 120 db:3306;
+        wait-for-it -t 120 redis-cache:6379;
+        wait-for-it -t 120 redis-queue:6379;
+        export start=`date +%s`;
+        until [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".db_host // empty"` ]] && \
+          [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_cache // empty"` ]] && \
+          [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_queue // empty"` ]];
+        do
+          echo "Waiting for sites/common_site_config.json to be created";
+          sleep 5;
+          if (( `date +%s`-start > 120 )); then
+            echo "could not find sites/common_site_config.json with required keys";
+            exit 1
+          fi
+        done;
+        echo "sites/common_site_config.json found";
+        bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend;
+
+  db:
+    image: mariadb:10.6
+    platform: linux/amd64
+    healthcheck:
+      test: mysqladmin ping -h localhost --password=admin
+      interval: 1s
+      retries: 20
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
+      - --skip-character-set-client-handshake
+      - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
+    environment:
+      MYSQL_ROOT_PASSWORD: admin
+    volumes:
+      - db-data:/var/lib/mysql
+
+  frontend:
+    image: frappe/erpnext:v15
+    platform: linux/amd64
+    depends_on:
+      - websocket
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - nginx-entrypoint.sh
+    environment:
+      BACKEND: backend:8000
+      FRAPPE_SITE_NAME_HEADER: frontend
+      SOCKETIO: websocket:9000
+      UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
+      UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
+      UPSTREAM_REAL_IP_RECURSIVE: "off"
+      PROXY_READ_TIMEOUT: 120
+      CLIENT_MAX_BODY_SIZE: 50m
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
+    ports:
+      - "8080:8080"
+
+  queue-long:
+    image: frappe/erpnext:v15
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - bench
+      - worker
+      - --queue
+      - long,default,short
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
+
+  queue-short:
+    image: frappe/erpnext:v15
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - bench
+      - worker
+      - --queue
+      - short,default
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
+
+  redis-queue:
+    image: redis:6.2-alpine
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: on-failure
+    volumes:
+      - redis-queue-data:/data
+
+  redis-cache:
+    image: redis:6.2-alpine
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: on-failure
+
+  scheduler:
+    image: frappe/erpnext:v15
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - bench
+      - schedule
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
+
+  websocket:
+    image: frappe/erpnext:v15
+    platform: linux/amd64
+    deploy:
+      restart_policy:
+        condition: on-failure
+    command:
+      - node
+      - /home/frappe/frappe-bench/apps/frappe/socketio.js
+    volumes:
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
+
+volumes:
+  db-data:
+  redis-queue-data:
+  sites:
+  logs:
+```
+
+step3: run the docker
+
+```
+cd frappe_docker
+```
+
+```
+docker-compose -f ./pwd.yml up
+```
+
+---
+
+Wait for couple of minutes.
+
+Open localhost:8080

docs/single-compose-setup.md

@@ -0,0 +1,38 @@
+# Single Compose Setup
+
+This setup is a very simple single compose file that does everything to start required services and a frappe-bench. It is used to start play with docker instance with a site. The file is located in the root of repo and named `pwd.yml`.
+
+## Services
+
+### frappe-bench components
+
+- backend, serves gunicorn backend
+- frontend, serves static assets through nginx frontend reverse proxies websocket and gunicorn.
+- queue-long, long default and short rq worker.
+- queue-short, default and short rq worker.
+- schedule, event scheduler.
+- websocket, socketio websocket for realtime communication.
+
+### Run once configuration
+
+- configurator, configures `common_site_config.json` to set db and redis hosts.
+- create-site, creates one site to serve as default site for the frappe-bench.
+
+### Service dependencies
+
+- db, mariadb, container with frappe specific configuration.
+- redis-cache, redis for cache data.
+- redis-queue, redis for rq data and pub/sub.
+
+## Volumes
+
+- sites: Volume for bench data. Common config, all sites, all site configs and site files will be stored here.
+- logs: Volume for bench logs. all process logs are dumped here. No need to mount it. Each container will create a temporary volume for logs if not specified.
+
+## Adaptation
+
+If you understand containers use the `pwd.yml` as a reference to build more complex setup like, single server example, Docker Swarm stack, Kubernetes Helm chart, etc.
+
+This serves only site called `frontend` through the nginx. `FRAPPE_SITE_NAME_HEADER` is set to `frontend` and a default site called `frontend` is created.
+
+Change the `$$host` will allow container to accept any host header and serve that site. To escape `$` in compose yaml use it like `$$`. To unset default site remove `currentsite.txt` file from `sites` directory.

docs/single-server-example.md

@@ -41,7 +41,7 @@ chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
 
 ### Prepare
 
-Clone `frappe_docker` repo for the needed YAMLs and change the current working director of you shell to the cloned repo.
+Clone `frappe_docker` repo for the needed YAMLs and change the current working directory of your shell to the cloned repo.
 
 ```shell
 git clone https://github.com/frappe/frappe_docker
@@ -65,7 +65,7 @@ Create a file called `traefik.env` in `~/gitops`
 ```shell
 echo 'TRAEFIK_DOMAIN=traefik.example.com' > ~/gitops/traefik.env
 echo 'EMAIL=admin@example.com' >> ~/gitops/traefik.env
-echo 'HASHED_PASSWORD='$(openssl passwd -apr1 changeit | sed 's/\$/\\\$/g') >> ~/gitops/traefik.env
+echo 'HASHED_PASSWORD='$(openssl passwd -apr1 changeit | sed -e s/\\$/\\$\\$/g) >> ~/gitops/traefik.env
 ```
 
 Note:
@@ -82,18 +82,20 @@ EMAIL=admin@example.com
 HASHED_PASSWORD=$apr1$K.4gp7RT$tj9R2jHh0D4Gb5o5fIAzm/
 ```
 
+If Container does not deploy put the HASHED_PASSWORD in ''.
+
 Deploy the traefik container with letsencrypt SSL
 
 ```shell
 docker compose --project-name traefik \
   --env-file ~/gitops/traefik.env \
-  -f docs/compose/compose.traefik.yaml \
-  -f docs/compose/compose.traefik-ssl.yaml up -d
+  -f overrides/compose.traefik.yaml \
+  -f overrides/compose.traefik-ssl.yaml up -d
 ```
 
-This will make the traefik dashboard available on `traefik.example.com` and all certificates will reside in `/data/traefik/certificates` on host filesystem.
+This will make the traefik dashboard available on `traefik.example.com` and all certificates will reside in the Docker volume `cert-data`.
 
-For LAN setup deploy the traefik container without overriding `docs/compose/compose.traefik-ssl.yaml`.
+For LAN setup deploy the traefik container without overriding `overrides/compose.traefik-ssl.yaml`.
 
 ### Install MariaDB
 
@@ -120,7 +122,7 @@ Note: Change the password from `changeit` to more secure one.
 Deploy the mariadb container
 
 ```shell
-docker compose --project-name mariadb --env-file ~/gitops/mariadb.env -f docs/compose/compose.mariadb-shared.yaml up -d
+docker compose --project-name mariadb --env-file ~/gitops/mariadb.env -f overrides/compose.mariadb-shared.yaml up -d
 ```
 
 This will make `mariadb-database` service available under `mariadb-network`. Data will reside in `/data/mariadb`.
@@ -138,8 +140,8 @@ cp example.env ~/gitops/erpnext-one.env
 sed -i 's/DB_PASSWORD=123/DB_PASSWORD=changeit/g' ~/gitops/erpnext-one.env
 sed -i 's/DB_HOST=/DB_HOST=mariadb-database/g' ~/gitops/erpnext-one.env
 sed -i 's/DB_PORT=/DB_PORT=3306/g' ~/gitops/erpnext-one.env
+sed -i 's/SITES=`erp.example.com`/SITES=\`one.example.com\`,\`two.example.com\`/g' ~/gitops/erpnext-one.env
 echo 'ROUTER=erpnext-one' >> ~/gitops/erpnext-one.env
-echo "SITES=\`one.example.com\`,\`two.example.com\`" >> ~/gitops/erpnext-one.env
 echo "BENCH_NETWORK=erpnext-one" >> ~/gitops/erpnext-one.env
 ```
 
@@ -155,10 +157,9 @@ Create a yaml file called `erpnext-one.yaml` in `~/gitops` directory:
 docker compose --project-name erpnext-one \
   --env-file ~/gitops/erpnext-one.env \
   -f compose.yaml \
-  -f overrides/compose.erpnext.yaml \
   -f overrides/compose.redis.yaml \
-  -f docs/compose/compose.multi-bench.yaml \
-  -f docs/compose/compose.multi-bench-ssl.yaml config > ~/gitops/erpnext-one.yaml
+  -f overrides/compose.multi-bench.yaml \
+  -f overrides/compose.multi-bench-ssl.yaml config > ~/gitops/erpnext-one.yaml
 ```
 
 For LAN setup do not override `compose.multi-bench-ssl.yaml`.
@@ -176,7 +177,7 @@ Create sites `one.example.com` and `two.example.com`:
 ```shell
 # one.example.com
 docker compose --project-name erpnext-one exec backend \
-  bench new-site one.example.com --mariadb-root-password changeit --install-app erpnext --admin-password changeit
+  bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit one.example.com
 ```
 
 You can stop here and have a single bench single site setup complete. Continue to add one more site to the current bench.
@@ -184,7 +185,7 @@ You can stop here and have a single bench single site setup complete. Continue t
 ```shell
 # two.example.com
 docker compose --project-name erpnext-one exec backend \
-  bench new-site two.example.com --mariadb-root-password changeit --install-app erpnext --admin-password changeit
+  bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit two.example.com
 ```
 
 #### Create second bench
@@ -217,10 +218,9 @@ Create a yaml file called `erpnext-two.yaml` in `~/gitops` directory:
 docker compose --project-name erpnext-two \
   --env-file ~/gitops/erpnext-two.env \
   -f compose.yaml \
-  -f overrides/compose.erpnext.yaml \
   -f overrides/compose.redis.yaml \
-  -f docs/compose/compose.multi-bench.yaml \
-  -f docs/compose/compose.multi-bench-ssl.yaml config > ~/gitops/erpnext-two.yaml
+  -f overrides/compose.multi-bench.yaml \
+  -f overrides/compose.multi-bench-ssl.yaml config > ~/gitops/erpnext-two.yaml
 ```
 
 Use the above command after any changes are made to `erpnext-two.env` file to regenerate `~/gitops/erpnext-two.yaml`. e.g. after changing version to migrate the bench.
@@ -236,10 +236,10 @@ Create sites `three.example.com` and `four.example.com`:
 ```shell
 # three.example.com
 docker compose --project-name erpnext-two exec backend \
-  bench new-site three.example.com --mariadb-root-password changeit --install-app erpnext --admin-password changeit
+  bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit three.example.com
 # four.example.com
 docker compose --project-name erpnext-two exec backend \
-  bench new-site four.example.com --mariadb-root-password changeit --install-app erpnext --admin-password changeit
+  bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit four.example.com
 ```
 
 #### Create custom domain to existing site
@@ -271,8 +271,8 @@ Generate yaml to reverse proxy:
 ```shell
 docker compose --project-name custom-one-example \
   --env-file ~/gitops/custom-one-example.env \
-  -f docs/compose/compose.custom-domain.yaml \
-  -f docs/compose/compose.custom-domain-ssl.yaml config > ~/gitops/custom-one-example.yaml
+  -f overrides/compose.custom-domain.yaml \
+  -f overrides/compose.custom-domain-ssl.yaml config > ~/gitops/custom-one-example.yaml
 ```
 
 For LAN setup do not override `compose.custom-domain-ssl.yaml`.

docs/site-operations.md

@@ -9,7 +9,7 @@ Note:
 - Wait for the `db` service to start and `configurator` to exit before trying to create a new site. Usually this takes up to 10 seconds.
 
 ```sh
-docker-compose exec backend bench new-site <site-name> --mariadb-root-password <db-password> --admin-password <admin-password>
+docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password <db-password> --admin-password <admin-password> <site-name>
 ```
 
 If you need to install some app, specify `--install-app`. To see all options, just run `bench new-site --help`.
@@ -24,7 +24,7 @@ docker-compose exec backend bench set-config -g root_password <root-password>
 Also command is slightly different:
 
 ```sh
-docker-compose exec backend bench new-site <site-name> --db-type postgres --admin-password <admin-password>
+docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password <admin-password> <site-name>
 ```
 
 ## Push backup to S3 storage

docs/tls-for-local-deployment.md

@@ -0,0 +1,25 @@
+# Accessing ERPNext through https on local deployment
+
+- ERPNext container deployment can be accessed through https easily using Caddy web server, Caddy will be used as reverse proxy and forward traffics to the frontend container.
+
+### Prerequisites
+
+- Caddy
+- Adding a domain name to hosts file
+
+#### Installation of caddy webserver
+
+- Follow the official Caddy website for the installation guide https://caddyserver.com/docs/install
+  After completing the installation open the configuration file of Caddy ( You find the config file in ` /etc/caddy/Caddyfile`), add the following configuration to forward traffics to the ERPNext frontend container
+
+```js
+erp.localdev.net {
+  tls internal
+
+  reverse_proxy localhost:8085 {
+
+  }
+}
+```
+
+- Caddy's root certificate must be added to other computers if computers from different networks access the ERPNext through https.

docs/troubleshoot.md

@@ -1,13 +1,21 @@
 1. [Fixing MariaDB issues after rebuilding the container](#fixing-mariadb-issues-after-rebuilding-the-container)
-1. [Letsencrypt companion not working](#letsencrypt-companion-not-working)
 1. [docker-compose does not recognize variables from `.env` file](#docker-compose-does-not-recognize-variables-from-env-file)
 1. [Windows Based Installation](#windows-based-installation)
 
 ### Fixing MariaDB issues after rebuilding the container
 
-For any reason after rebuilding the container if you are not be able to access MariaDB correctly with the previous configuration. Follow these instructions.
+For any reason after rebuilding the container if you are not be able to access MariaDB correctly (i.e. `Access denied for user [...]`) with the previous configuration. Follow these instructions.
 
-The parameter `'db_name'@'%'` needs to be set in MariaDB and permission to the site database suitably assigned to the user.
+First test for network issues. Manually connect to the database through the `backend` container:
+
+```
+docker exec -it frappe_docker-backend-1 bash
+mysql -uroot -padmin -hdb
+```
+
+Replace `root` with the database root user name, `admin` with the root password, and `db` with the service name specified in the docker-compose `.yml` configuration file. If the connection to the database is successful, then the network configuration is correct and you can proceed to the next step. Otherwise, modify the docker-compose `.yml` configuration file, in the `configurator` service's `environment` section, to use the container names (`frappe_docker-db-1`, `frappe_docker-redis-cache-1`, `frappe_docker-redis-queue-1` or as otherwise shown with `docker ps`) instead of the service names and rebuild the containers.
+
+Then, the parameter `'db_name'@'%'` needs to be set in MariaDB and permission to the site database suitably assigned to the user.
 
 This step has to be repeated for all sites available under the current bench.
 Example shows the queries to be executed for site `localhost`
@@ -23,35 +31,49 @@ and take note of the parameters `db_name` and `db_password`.
 Enter MariaDB Interactive shell:
 
 ```shell
-mysql -uroot -p123 -hmariadb
+mysql -uroot -padmin -hdb
 ```
 
-Execute following queries replacing `db_name` and `db_password` with the values found in site_config.json.
+The parameter `'db_name'@'%'` must not be duplicated. Verify that it is unique with the command:
+
+```
+SELECT User, Host FROM mysql.user;
+```
+
+Delete duplicated entries, if found, with the following:
+
+```
+DROP USER 'db_name'@'host';
+```
+
+Modify permissions by executing following queries replacing `db_name` and `db_password` with the values found in site_config.json.
 
 ```sql
-UPDATE mysql.user SET Host = '%' where User = 'db_name'; FLUSH PRIVILEGES;
+-- if there is no user created already first try to created it using the next command
+-- CREATE USER 'db_name'@'%' IDENTIFIED BY 'your_password';
+-- skip the upgrade command below if you use the create command above
+UPDATE mysql.global_priv SET Host = '%' where User = 'db_name'; FLUSH PRIVILEGES;
 SET PASSWORD FOR 'db_name'@'%' = PASSWORD('db_password'); FLUSH PRIVILEGES;
-GRANT ALL PRIVILEGES ON `db_name`.* TO 'db_name'@'%'; FLUSH PRIVILEGES;
+GRANT ALL PRIVILEGES ON `db_name`.* TO 'db_name'@'%' IDENTIFIED BY 'db_password' WITH GRANT OPTION; FLUSH PRIVILEGES;
 EXIT;
 ```
 
-Note: For MariaDB 10.4 and above use `mysql.global_priv` instead of `mysql.user`.
-
-### 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.
+Note: For MariaDB 10.3 and older use `mysql.user` instead of `mysql.global_priv`.
 
 ### 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.
+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.
 
 ### Windows Based Installation
 
 - Set environment variable `COMPOSE_CONVERT_WINDOWS_PATHS` e.g. `set COMPOSE_CONVERT_WINDOWS_PATHS=1`
-- Make the `frappe-mariadb.cnf` read-only for mariadb container to pick it up.
-- 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
+
+### Redo installation
+
+- If you have made changes and just want to start over again (abandoning all changes), remove all docker
+  - containers
+  - images
+  - volumes
+- Install a fresh

example.env

@@ -1,9 +1,6 @@
-# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
+# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md
 
-FRAPPE_VERSION=v14.4.3
-
-# Only with ERPNext override
-ERPNEXT_VERSION=v14.0.2
+ERPNEXT_VERSION=v15.54.4
 
 DB_PASSWORD=123
 
@@ -14,7 +11,6 @@ DB_PORT=
 # Only if you use external Redis
 REDIS_CACHE=
 REDIS_QUEUE=
-REDIS_SOCKETIO=
 
 # Only with HTTPS override
 LETSENCRYPT_EMAIL=mail@example.com
@@ -27,6 +23,9 @@ LETSENCRYPT_EMAIL=mail@example.com
 # and do want to access it by `127.0.0.1` host. Than you would set this variable to `mysite`.
 FRAPPE_SITE_NAME_HEADER=
 
+# Default value is `8080`.
+HTTP_PUBLISH_PORT=
+
 # Default value is `127.0.0.1`. Set IP address as our trusted upstream address.
 UPSTREAM_REAL_IP_ADDRESS=
 
@@ -38,3 +37,16 @@ UPSTREAM_REAL_IP_HEADER=
 # is replaced by the last address sent in the request header field defined by the real_ip_header directive.
 # If recursive search is enabled, the original client address that matches one of the trusted addresses is replaced by the last non-trusted address sent in the request header field.
 UPSTREAM_REAL_IP_RECURSIVE=
+
+# All Values Allowed by nginx proxy_read_timeout are allowed, default value is 120s
+# Useful if you have longrunning print formats or slow loading sites
+PROXY_READ_TIMEOUT=
+
+# All Values allowed by nginx client_max_body_size are allowed, default value is 50m
+# Necessary if the upload limit in the frappe application is increased
+CLIENT_MAX_BODY_SIZE=
+
+# List of sites for letsencrypt certificates quoted with backtick (`) and separated by comma (,)
+# More https://doc.traefik.io/traefik/routing/routers/#rule
+# About acme https://doc.traefik.io/traefik/https/acme/#domain-definition
+SITES=`erp.example.com`

images/bench/Dockerfile

@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim as bench
+FROM debian:bookworm-slim AS bench
 
 LABEL author=frappé
 
 ARG GIT_REPO=https://github.com/frappe/bench.git
-ARG GIT_BRANCH=develop
+ARG GIT_BRANCH=v5.x
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
@@ -13,14 +13,16 @@ 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 \
     xfonts-75dpi \
     xfonts-base \
+    # weasyprint dependencies
+    libpango-1.0-0 \
+    libharfbuzz0b \
+    libpangoft2-1.0-0 \
+    libpangocairo-1.0-0 \
     # to work inside the container
     locales \
     build-essential \
@@ -42,6 +44,7 @@ RUN apt-get update \
     liblcms2-dev \
     libldap2-dev \
     libmariadb-dev \
+    pkg-config \
     libsasl2-dev \
     libtiff5-dev \
     libwebp-dev \
@@ -51,16 +54,34 @@ RUN apt-get update \
     ssh-client \
     # VSCode container requirements
     net-tools \
+    # 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 \
+    file \
     && rm -rf /var/lib/apt/lists/*
 
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales
 
 # Detect arch and install wkhtmltopdf
-ENV WKHTMLTOPDF_VERSION 0.12.6-1
+ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
+ARG WKHTMLTOPDF_DISTRO=bookworm
 RUN if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \
     && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \
-    && downloaded_file=wkhtmltox_$WKHTMLTOPDF_VERSION.buster_${ARCH}.deb \
+    && downloaded_file=wkhtmltox_${WKHTMLTOPDF_VERSION}.${WKHTMLTOPDF_DISTRO}_${ARCH}.deb \
     && wget -q https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
     && dpkg -i $downloaded_file \
     && rm $downloaded_file
@@ -76,44 +97,42 @@ 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
-ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
+ENV PYTHON_VERSION_V14=3.10.13
+ENV PYTHON_VERSION=3.11.6
+ENV PYENV_ROOT=/home/frappe/.pyenv
+ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 
 # From https://github.com/pyenv/pyenv#basic-github-checkout
 RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \
-    && pyenv install $PYTHON_VERSION_V12 \
-    && pyenv install $PYTHON_VERSION_V13 \
+    && pyenv install $PYTHON_VERSION_V14 \
     && pyenv install $PYTHON_VERSION \
-    && pyenv global $PYTHON_VERSION $PYTHON_VERSION_V12 $PYTHON_VERSION_v13 \
+    && PYENV_VERSION=$PYTHON_VERSION_V14 pip install --no-cache-dir virtualenv \
+    && PYENV_VERSION=$PYTHON_VERSION pip install --no-cache-dir virtualenv \
+    && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v14 \
     && sed -Ei -e '/^([^#]|$)/ {a export PYENV_ROOT="/home/frappe/.pyenv" a export PATH="$PYENV_ROOT/bin:$PATH" a ' -e ':a' -e '$!{n;ba};}' ~/.profile \
     && echo 'eval "$(pyenv init --path)"' >>~/.profile \
     && echo 'eval "$(pyenv init -)"' >>~/.bashrc
 
 # Clone and install bench in the local user home directory
 # For development, bench source is located in ~/.bench
-ENV PATH /home/frappe/.local/bin:$PATH
+ENV PATH=/home/frappe/.local/bin:$PATH
 # Skip editable-bench warning
 # https://github.com/frappe/bench/commit/20560c97c4246b2480d7358c722bc9ad13606138
 RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \
-    && pip install --user -e .bench \
+    && pip install --no-cache-dir --user -e .bench \
     && echo "export PATH=/home/frappe/.local/bin:\$PATH" >>/home/frappe/.bashrc \
     && echo "export BENCH_DEVELOPER=1" >>/home/frappe/.bashrc
 
 # 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}
+ENV NODE_VERSION_14=16.20.2
+ENV NODE_VERSION=18.18.2
+ENV NVM_DIR=/home/frappe/.nvm
+ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
 
-RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \
+RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \
     && . ${NVM_DIR}/nvm.sh \
-    && nvm install ${NODE_VERSION_FRAPPEV11} \
-    && nvm use v${NODE_VERSION_FRAPPEV11} \
+    && nvm install ${NODE_VERSION_14} \
+    && nvm use v${NODE_VERSION_14} \
     && npm install -g yarn \
     && nvm install ${NODE_VERSION} \
     && nvm use v${NODE_VERSION} \
@@ -127,7 +146,7 @@ RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh |
 
 EXPOSE 8000-8005 9000-9005 6787
 
-FROM bench as bench-test
+FROM bench AS bench-test
 
 # Print version and verify bashrc is properly sourced so that everything works
 # in the interactive shell and Dockerfile

images/custom/Containerfile

@@ -0,0 +1,158 @@
+ARG PYTHON_VERSION=3.11.6
+ARG DEBIAN_BASE=bookworm
+FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
+
+COPY resources/nginx-template.conf /templates/nginx/frappe.conf.template
+COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
+
+ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
+ARG WKHTMLTOPDF_DISTRO=bookworm
+ARG NODE_VERSION=18.18.2
+ENV NVM_DIR=/home/frappe/.nvm
+ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
+
+RUN useradd -ms /bin/bash frappe \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y \
+    curl \
+    git \
+    vim \
+    nginx \
+    gettext-base \
+    file \
+    # weasyprint dependencies
+    libpango-1.0-0 \
+    libharfbuzz0b \
+    libpangoft2-1.0-0 \
+    libpangocairo-1.0-0 \
+    # For backups
+    restic \
+    gpg \
+    # MariaDB
+    mariadb-client \
+    less \
+    # Postgres
+    libpq-dev \
+    postgresql-client \
+    # For healthcheck
+    wait-for-it \
+    jq \
+    # NodeJS
+    && mkdir -p ${NVM_DIR} \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \
+    && . ${NVM_DIR}/nvm.sh \
+    && nvm install ${NODE_VERSION} \
+    && nvm use v${NODE_VERSION} \
+    && npm install -g yarn \
+    && nvm alias default v${NODE_VERSION} \
+    && rm -rf ${NVM_DIR}/.cache \
+    && echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \
+    && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm' >>/home/frappe/.bashrc \
+    && echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion' >>/home/frappe/.bashrc \
+    # Install wkhtmltopdf with patched qt
+    && if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \
+    && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \
+    && downloaded_file=wkhtmltox_${WKHTMLTOPDF_VERSION}.${WKHTMLTOPDF_DISTRO}_${ARCH}.deb \
+    && curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
+    && apt-get install -y ./$downloaded_file \
+    && rm $downloaded_file \
+    # Clean up
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -fr /etc/nginx/sites-enabled/default \
+    && pip3 install frappe-bench \
+    # Fixes for non-root nginx and logs to stdout
+    && sed -i '/user www-data/d' /etc/nginx/nginx.conf \
+    && ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log \
+    && touch /run/nginx.pid \
+    && chown -R frappe:frappe /etc/nginx/conf.d \
+    && chown -R frappe:frappe /etc/nginx/nginx.conf \
+    && chown -R frappe:frappe /var/log/nginx \
+    && chown -R frappe:frappe /var/lib/nginx \
+    && chown -R frappe:frappe /run/nginx.pid \
+    && chmod 755 /usr/local/bin/nginx-entrypoint.sh \
+    && chmod 644 /templates/nginx/frappe.conf.template
+
+FROM base AS builder
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    # For frappe framework
+    wget \
+    #for building arm64 binaries
+    libcairo2-dev \
+    libpango1.0-dev \
+    libjpeg-dev \
+    libgif-dev \
+    librsvg2-dev \
+    # For psycopg2
+    libpq-dev \
+    # Other
+    libffi-dev \
+    liblcms2-dev \
+    libldap2-dev \
+    libmariadb-dev \
+    libsasl2-dev \
+    libtiff5-dev \
+    libwebp-dev \
+    redis-tools \
+    rlwrap \
+    tk8.6-dev \
+    cron \
+    # For pandas
+    gcc \
+    build-essential \
+    libbz2-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# apps.json includes
+ARG APPS_JSON_BASE64
+RUN if [ -n "${APPS_JSON_BASE64}" ]; then \
+    mkdir /opt/frappe && echo "${APPS_JSON_BASE64}" | base64 -d > /opt/frappe/apps.json; \
+  fi
+
+USER frappe
+
+ARG FRAPPE_BRANCH=version-15
+ARG FRAPPE_PATH=https://github.com/frappe/frappe
+RUN export APP_INSTALL_ARGS="" && \
+  if [ -n "${APPS_JSON_BASE64}" ]; then \
+    export APP_INSTALL_ARGS="--apps_path=/opt/frappe/apps.json"; \
+  fi && \
+  bench init ${APP_INSTALL_ARGS}\
+    --frappe-branch=${FRAPPE_BRANCH} \
+    --frappe-path=${FRAPPE_PATH} \
+    --no-procfile \
+    --no-backups \
+    --skip-redis-config-generation \
+    --verbose \
+    /home/frappe/frappe-bench && \
+  cd /home/frappe/frappe-bench && \
+  echo "{}" > sites/common_site_config.json && \
+  find apps -mindepth 1 -path "*/.git" | xargs rm -fr
+
+FROM base AS backend
+
+USER frappe
+
+COPY --from=builder --chown=frappe:frappe /home/frappe/frappe-bench /home/frappe/frappe-bench
+
+WORKDIR /home/frappe/frappe-bench
+
+VOLUME [ \
+  "/home/frappe/frappe-bench/sites", \
+  "/home/frappe/frappe-bench/sites/assets", \
+  "/home/frappe/frappe-bench/logs" \
+]
+
+CMD [ \
+  "/home/frappe/frappe-bench/env/bin/gunicorn", \
+  "--chdir=/home/frappe/frappe-bench/sites", \
+  "--bind=0.0.0.0:8000", \
+  "--threads=4", \
+  "--workers=2", \
+  "--worker-class=gthread", \
+  "--worker-tmp-dir=/dev/shm", \
+  "--timeout=120", \
+  "--preload", \
+  "frappe.app:application" \
+]

images/layered/Containerfile

@@ -0,0 +1,58 @@
+ARG FRAPPE_BRANCH=version-15
+
+FROM frappe/build:${FRAPPE_BRANCH} AS builder
+
+ARG FRAPPE_BRANCH=version-15
+ARG FRAPPE_PATH=https://github.com/frappe/frappe
+ARG APPS_JSON_BASE64
+
+USER root
+
+RUN if [ -n "${APPS_JSON_BASE64}" ]; then \
+    mkdir /opt/frappe && echo "${APPS_JSON_BASE64}" | base64 -d > /opt/frappe/apps.json; \
+  fi
+
+USER frappe
+
+RUN export APP_INSTALL_ARGS="" && \
+  if [ -n "${APPS_JSON_BASE64}" ]; then \
+    export APP_INSTALL_ARGS="--apps_path=/opt/frappe/apps.json"; \
+  fi && \
+  bench init ${APP_INSTALL_ARGS}\
+    --frappe-branch=${FRAPPE_BRANCH} \
+    --frappe-path=${FRAPPE_PATH} \
+    --no-procfile \
+    --no-backups \
+    --skip-redis-config-generation \
+    --verbose \
+    /home/frappe/frappe-bench && \
+  cd /home/frappe/frappe-bench && \
+  echo "{}" > sites/common_site_config.json && \
+  find apps -mindepth 1 -path "*/.git" | xargs rm -fr
+
+FROM frappe/base:${FRAPPE_BRANCH} AS backend
+
+USER frappe
+
+COPY --from=builder --chown=frappe:frappe /home/frappe/frappe-bench /home/frappe/frappe-bench
+
+WORKDIR /home/frappe/frappe-bench
+
+VOLUME [ \
+  "/home/frappe/frappe-bench/sites", \
+  "/home/frappe/frappe-bench/sites/assets", \
+  "/home/frappe/frappe-bench/logs" \
+]
+
+CMD [ \
+  "/home/frappe/frappe-bench/env/bin/gunicorn", \
+  "--chdir=/home/frappe/frappe-bench/sites", \
+  "--bind=0.0.0.0:8000", \
+  "--threads=4", \
+  "--workers=2", \
+  "--worker-class=gthread", \
+  "--worker-tmp-dir=/dev/shm", \
+  "--timeout=120", \
+  "--preload", \
+  "frappe.app:application" \
+]

images/nginx/Dockerfile

@@ -1,70 +0,0 @@
-FROM node:14-bullseye-slim as assets_builder
-
-RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-    git \
-    build-essential \
-    python \
-    ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /frappe-bench
-
-RUN mkdir -p sites/assets /out/assets \
-    && echo frappe >sites/apps.txt
-
-ARG FRAPPE_VERSION
-ARG FRAPPE_REPO=https://github.com/frappe/frappe
-# Install development node modules
-RUN git clone --depth 1 -b ${FRAPPE_VERSION} ${FRAPPE_REPO} apps/frappe \
-    && yarn --cwd apps/frappe \
-    # TODO: Currently `yarn run production` doesn't create .build on develop branch: https://github.com/frappe/frappe/issues/15396
-    && if [ ! -f sites/.build ]; then touch sites/.build; fi \
-    && cp sites/.build /out
-
-COPY install-app.sh /usr/local/bin/install-app
-
-
-FROM assets_builder as frappe_assets
-
-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 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
-
-
-FROM alpine/git as bench
-
-# Error pages
-ARG BENCH_REPO=https://github.com/frappe/bench
-RUN git clone --depth 1 ${BENCH_REPO} /tmp/bench \
-    && mkdir /out \
-    && mv /tmp/bench/bench/config/templates/502.html /out/
-
-
-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
-# https://github.com/nginxinc/docker-nginx-unprivileged/blob/main/stable/alpine/docker-entrypoint.sh
-COPY entrypoint.sh /docker-entrypoint.d/frappe-entrypoint.sh
-
-COPY --from=bench /out /usr/share/nginx/html/
-COPY --from=frappe_assets /out /usr/share/nginx/html
-
-USER 1000
-
-
-FROM frappe as erpnext
-
-COPY --from=erpnext_assets /out /usr/share/nginx/html

images/nginx/entrypoint.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Update timestamp for ".build" file to enable caching assets:
-# https://github.com/frappe/frappe/blob/52d8e6d952130eea64a9990b9fd5b1f6877be1b7/frappe/utils/__init__.py#L799-L805
-if [ -d /usr/share/nginx/html/sites ]; then
-  touch /usr/share/nginx/html/sites/.build -r /usr/share/nginx/html/.build
-fi

images/nginx/install-app.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-APP=$1
-
-cleanup() {
-  rm -rf "apps/$APP"
-  rm -rf sites/assets/*
-}
-
-cd /frappe-bench
-
-if ! test -d "apps/$APP/$APP/public"; then
-  cleanup
-  exit 0
-fi
-
-# Add all not built assets
-cp -r "apps/$APP/$APP/public" "/out/assets/$APP"
-
-# Add production node modules
-yarn --cwd "apps/$APP" --prod
-cp -r "apps/$APP/node_modules" "/out/assets/$APP/node_modules"
-
-# Add built assets
-yarn --cwd "apps/$APP"
-echo "$APP" >>sites/apps.txt
-yarn --cwd apps/frappe run production --app "$APP"
-cp -r sites/assets /out
-
-cleanup

images/production/Containerfile

@@ -0,0 +1,147 @@
+ARG PYTHON_VERSION=3.11.6
+ARG DEBIAN_BASE=bookworm
+FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
+
+ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
+ARG WKHTMLTOPDF_DISTRO=bookworm
+ARG NODE_VERSION=18.18.2
+ENV NVM_DIR=/home/frappe/.nvm
+ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
+
+RUN useradd -ms /bin/bash frappe \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y \
+    curl \
+    git \
+    vim \
+    nginx \
+    gettext-base \
+    file \
+    # weasyprint dependencies
+    libpango-1.0-0 \
+    libharfbuzz0b \
+    libpangoft2-1.0-0 \
+    libpangocairo-1.0-0 \
+    # For backups
+    restic \
+    gpg \
+    # MariaDB
+    mariadb-client \
+    less \
+    # Postgres
+    libpq-dev \
+    postgresql-client \
+    # For healthcheck
+    wait-for-it \
+    jq \
+    # NodeJS
+    && mkdir -p ${NVM_DIR} \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \
+    && . ${NVM_DIR}/nvm.sh \
+    && nvm install ${NODE_VERSION} \
+    && nvm use v${NODE_VERSION} \
+    && npm install -g yarn \
+    && nvm alias default v${NODE_VERSION} \
+    && rm -rf ${NVM_DIR}/.cache \
+    && echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \
+    && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm' >>/home/frappe/.bashrc \
+    && echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion' >>/home/frappe/.bashrc \
+    # Install wkhtmltopdf with patched qt
+    && if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \
+    && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \
+    && downloaded_file=wkhtmltox_${WKHTMLTOPDF_VERSION}.${WKHTMLTOPDF_DISTRO}_${ARCH}.deb \
+    && curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
+    && apt-get install -y ./$downloaded_file \
+    && rm $downloaded_file \
+    # Clean up
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -fr /etc/nginx/sites-enabled/default \
+    && pip3 install frappe-bench \
+    # Fixes for non-root nginx and logs to stdout
+    && sed -i '/user www-data/d' /etc/nginx/nginx.conf \
+    && ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log \
+    && touch /run/nginx.pid \
+    && chown -R frappe:frappe /etc/nginx/conf.d \
+    && chown -R frappe:frappe /etc/nginx/nginx.conf \
+    && chown -R frappe:frappe /var/log/nginx \
+    && chown -R frappe:frappe /var/lib/nginx \
+    && chown -R frappe:frappe /run/nginx.pid
+
+COPY resources/nginx-template.conf /templates/nginx/frappe.conf.template
+COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
+
+FROM base AS build
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    # For frappe framework
+    wget \
+    # For psycopg2
+    libpq-dev \
+    # Other
+    libffi-dev \
+    liblcms2-dev \
+    libldap2-dev \
+    libmariadb-dev \
+    libsasl2-dev \
+    libtiff5-dev \
+    libwebp-dev \
+    redis-tools \
+    rlwrap \
+    tk8.6-dev \
+    cron \
+    # For pandas
+    gcc \
+    build-essential \
+    libbz2-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+USER frappe
+
+FROM build AS builder
+
+ARG FRAPPE_BRANCH=version-15
+ARG FRAPPE_PATH=https://github.com/frappe/frappe
+ARG ERPNEXT_REPO=https://github.com/frappe/erpnext
+ARG ERPNEXT_BRANCH=version-15
+RUN bench init \
+  --frappe-branch=${FRAPPE_BRANCH} \
+  --frappe-path=${FRAPPE_PATH} \
+  --no-procfile \
+  --no-backups \
+  --skip-redis-config-generation \
+  --verbose \
+  /home/frappe/frappe-bench && \
+  cd /home/frappe/frappe-bench && \
+  bench get-app --branch=${ERPNEXT_BRANCH} --resolve-deps erpnext ${ERPNEXT_REPO} && \
+  echo "{}" > sites/common_site_config.json && \
+  find apps -mindepth 1 -path "*/.git" | xargs rm -fr
+
+FROM base AS erpnext
+
+USER frappe
+
+RUN echo "echo \"Commands restricted in prodution container, Read FAQ before you proceed: https://frappe.fyi/ctr-faq\"" >> ~/.bashrc
+
+COPY --from=builder --chown=frappe:frappe /home/frappe/frappe-bench /home/frappe/frappe-bench
+
+WORKDIR /home/frappe/frappe-bench
+
+VOLUME [ \
+  "/home/frappe/frappe-bench/sites", \
+  "/home/frappe/frappe-bench/sites/assets", \
+  "/home/frappe/frappe-bench/logs" \
+]
+
+CMD [ \
+  "/home/frappe/frappe-bench/env/bin/gunicorn", \
+  "--chdir=/home/frappe/frappe-bench/sites", \
+  "--bind=0.0.0.0:8000", \
+  "--threads=4", \
+  "--workers=2", \
+  "--worker-class=gthread", \
+  "--worker-tmp-dir=/dev/shm", \
+  "--timeout=120", \
+  "--preload", \
+  "frappe.app:application" \
+]

images/socketio/Dockerfile

@@ -1,25 +0,0 @@
-FROM alpine/git as builder
-
-ARG FRAPPE_VERSION
-ARG FRAPPE_REPO=https://github.com/frappe/frappe
-RUN git clone --depth 1 -b ${FRAPPE_VERSION} ${FRAPPE_REPO} /opt/frappe
-
-
-FROM node:17-alpine
-
-RUN addgroup -S frappe \
-    && adduser -S frappe -G frappe
-USER frappe
-
-WORKDIR /home/frappe/frappe-bench
-RUN mkdir -p sites apps/frappe
-
-COPY --chown=frappe:frappe --from=builder /opt/frappe/socketio.js /opt/frappe/node_utils.js apps/frappe/
-COPY --chown=frappe:frappe package.json apps/frappe/
-
-RUN cd apps/frappe \
-    && npm install
-
-WORKDIR /home/frappe/frappe-bench/sites
-
-CMD [ "node", "/home/frappe/frappe-bench/apps/frappe/socketio.js" ]

images/socketio/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "frappe-socketio",
-  "version": "1.0.1",
-  "description": "Frappe SocketIO Server",
-  "author": "Revant Nandgaonkar",
-  "license": "MIT",
-  "dependencies": {
-    "express": "^4.17.1",
-    "redis": "^3.1.1",
-    "socket.io": "^2.4.0",
-    "superagent": "^5.1.0"
-  }
-}

images/worker/Dockerfile

@@ -1,134 +0,0 @@
-# syntax=docker/dockerfile:1.3
-
-ARG PYTHON_VERSION
-FROM python:${PYTHON_VERSION}-slim-bullseye as base
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # Postgres
-    libpq-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN useradd -ms /bin/bash frappe
-USER frappe
-RUN mkdir -p /home/frappe/frappe-bench/apps /home/frappe/frappe-bench/logs /home/frappe/frappe-bench/sites
-WORKDIR /home/frappe/frappe-bench
-
-USER root
-RUN pip install -U pip wheel \
-    && python -m venv env \
-    && env/bin/pip install -U pip wheel
-
-COPY install-app.sh /usr/local/bin/install-app
-
-
-FROM base as build_deps
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # Install git here because it is not required in production
-    git \
-    # gcc and g++ are required for building different packages across different versions
-    # of Frappe and ERPNext and also on different platforms (for example, linux/arm64).
-    # It is safe to install build deps even if they are not required
-    # because they won't be included in final images.
-    gcc \
-    g++ \
-    # Make is required to build wheels of ERPNext deps in develop branch for linux/arm64
-    make \
-    && rm -rf /var/lib/apt/lists/*
-
-
-FROM build_deps as frappe_builder
-
-ARG FRAPPE_VERSION
-ARG FRAPPE_REPO=https://github.com/frappe/frappe
-RUN --mount=type=cache,target=/root/.cache/pip \
-    git clone --depth 1 -b ${FRAPPE_VERSION} ${FRAPPE_REPO} apps/frappe \
-    && install-app frappe \
-    && env/bin/pip install -U gevent \
-    # Link Frappe's node_modules/ to make Website Theme work
-    && mkdir -p /home/frappe/frappe-bench/sites/assets/frappe/node_modules \
-    && ln -s /home/frappe/frappe-bench/sites/assets/frappe/node_modules /home/frappe/frappe-bench/apps/frappe/node_modules
-
-
-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 \
-    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
-
-
-FROM base as configured_base
-
-ARG WKHTMLTOPDF_VERSION=0.12.6-1
-
-RUN apt-get update \
-    # Setup Node lists
-    && apt-get install --no-install-recommends -y curl \
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-    # Install wkhtmltopdf with patched qt
-    && if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \
-    && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \
-    && downloaded_file=wkhtmltox_$WKHTMLTOPDF_VERSION.buster_${ARCH}.deb \
-    && curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \
-    && apt-get install -y ./$downloaded_file \
-    && rm $downloaded_file \
-    # Cleanup
-    && apt-get purge -y --auto-remove curl \
-    && apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # MariaDB
-    mariadb-client \
-    # Postgres
-    postgresql-client \
-    # For healthcheck
-    wait-for-it \
-    jq \
-    # other
-    nodejs \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY pretend-bench.sh /usr/local/bin/bench
-COPY push_backup.py /usr/local/bin/push-backup
-COPY configure.py patched_bench_helper.py /usr/local/bin/
-COPY gevent_patch.py /opt/patches/
-
-WORKDIR /home/frappe/frappe-bench/sites
-
-CMD [ "/home/frappe/frappe-bench/env/bin/gunicorn", \
-  "--bind=0.0.0.0:8000", \
-  "--threads=4", \
-  "--workers=2", \
-  "--worker-class=gthread", \
-  "--worker-tmp-dir=/dev/shm", \
-  "--timeout=120", \
-  "--preload", \
-  "frappe.app:application" \
-]
-
-
-FROM configured_base as frappe
-
-COPY --from=frappe_builder /home/frappe/frappe-bench/apps/frappe /home/frappe/frappe-bench/apps/frappe
-COPY --from=frappe_builder /home/frappe/frappe-bench/env /home/frappe/frappe-bench/env
-COPY --from=frappe_builder /home/frappe/frappe-bench/sites/apps.txt /home/frappe/frappe-bench/sites/
-
-USER frappe
-
-
-# Split frappe and erpnext to reduce image size (because of frappe-bench/env/ directory)
-FROM configured_base as 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/
-
-USER frappe

images/worker/configure.py

@@ -1,56 +0,0 @@
-#!/usr/local/bin/python
-from __future__ import annotations
-
-import json
-import os
-from typing import Any, TypeVar
-
-
-def update_config(**values: Any):
-    fname = "common_site_config.json"
-    if not os.path.exists(fname):
-        with open(fname, "a") as f:
-            json.dump({}, f)
-
-    with open(fname, "r+") as f:
-        config: dict[str, Any] = json.load(f)
-        config.update(values)
-        f.seek(0)
-        f.truncate()
-        json.dump(config, f)
-
-
-_T = TypeVar("_T")
-
-
-def env(name: str, type_: type[_T] = str) -> _T:
-    value = os.getenv(name)
-    if not value:
-        raise RuntimeError(f'Required environment variable "{name}" not set')
-    try:
-        value = type_(value)
-    except Exception:
-        raise RuntimeError(
-            f'Cannot convert environment variable "{name}" to type "{type_}"'
-        )
-    return value
-
-
-def generate_redis_url(url: str):
-    return f"redis://{url}"
-
-
-def main() -> int:
-    update_config(
-        db_host=env("DB_HOST"),
-        db_port=env("DB_PORT", int),
-        redis_cache=generate_redis_url(env("REDIS_CACHE")),
-        redis_queue=generate_redis_url(env("REDIS_QUEUE")),
-        redis_socketio=generate_redis_url(env("REDIS_SOCKETIO")),
-        socketio_port=env("SOCKETIO_PORT", int),
-    )
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

images/worker/gevent_patch.py

@@ -1,3 +0,0 @@
-import gevent.monkey
-
-gevent.monkey.patch_all()

images/worker/install-app.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-APP=$1
-
-cd /home/frappe/frappe-bench
-
-rm -rf "apps/$APP/.git"
-
-env/bin/pip install -e "apps/$APP"
-
-echo "$APP" >>sites/apps.txt

images/worker/patched_bench_helper.py

@@ -1,48 +0,0 @@
-from __future__ import annotations
-
-import click
-import click.exceptions
-import frappe.app
-import frappe.database.db_manager
-import frappe.utils.bench_helper
-
-
-def patch_database_creator():
-    """
-    We need to interrupt Frappe site database creation to monkeypatch
-    functions that resolve host for user that owns site database.
-    In frappe_docker this was implemented in "new" command:
-    https://github.com/frappe/frappe_docker/blob/c808ad1767feaf793a2d14541ac0f4d9cbab45b3/build/frappe-worker/commands/new.py#L87
-    """
-
-    frappe.database.db_manager.DbManager.get_current_host = lambda self: "%"
-
-
-def patch_click_usage_error():
-    bits: tuple[str, ...] = (
-        click.style(
-            "Only Frappe framework bench commands are available in container setup.",
-            fg="yellow",
-            bold=True,
-        ),
-        "https://frappeframework.com/docs/v13/user/en/bench/frappe-commands",
-    )
-    notice = "\n".join(bits)
-
-    def format_message(self: click.exceptions.UsageError):
-        if "No such command" in self.message:
-            return f"{notice}\n\n{self.message}"
-        return self.message
-
-    click.exceptions.UsageError.format_message = format_message
-
-
-def main() -> int:
-    patch_database_creator()
-    patch_click_usage_error()
-    frappe.utils.bench_helper.main()
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

images/worker/pretend-bench.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-# shellcheck disable=SC2068
-~/frappe-bench/env/bin/python /usr/local/bin/patched_bench_helper.py frappe $@

images/worker/push_backup.py

@@ -1,117 +0,0 @@
-#!/home/frappe/frappe-bench/env/bin/python
-from __future__ import annotations
-
-import argparse
-import os
-import sys
-from pathlib import Path
-from typing import TYPE_CHECKING, Any, List, cast
-
-import boto3
-import frappe
-from frappe.utils.backups import BackupGenerator
-
-if TYPE_CHECKING:
-    from mypy_boto3_s3.service_resource import _Bucket
-
-
-class Arguments(argparse.Namespace):
-    site: str
-    bucket: str
-    region_name: str
-    endpoint_url: str
-    aws_access_key_id: str
-    aws_secret_access_key: str
-    bucket_directory: str
-
-
-def _get_files_from_previous_backup(site_name: str) -> list[Path]:
-    frappe.connect(site_name)
-
-    conf = cast(Any, frappe.conf)
-    backup_generator = BackupGenerator(
-        db_name=conf.db_name,
-        user=conf.db_name,
-        password=conf.db_password,
-        db_host=frappe.db.host,
-        db_port=frappe.db.port,
-        db_type=conf.db_type,
-    )
-    recent_backup_files = backup_generator.get_recent_backup(24)
-
-    frappe.destroy()
-    return [Path(f) for f in recent_backup_files if f]
-
-
-def get_files_from_previous_backup(site_name: str) -> list[Path]:
-    files = _get_files_from_previous_backup(site_name)
-    if not files:
-        print("No backup found that was taken <24 hours ago.")
-    return files
-
-
-def get_bucket(args: Arguments) -> _Bucket:
-    return boto3.resource(
-        service_name="s3",
-        endpoint_url=args.endpoint_url,
-        region_name=args.region_name,
-        aws_access_key_id=args.aws_access_key_id,
-        aws_secret_access_key=args.aws_secret_access_key,
-    ).Bucket(args.bucket)
-
-
-def upload_file(
-    path: Path, site_name: str, bucket: _Bucket, bucket_directory: str = None
-) -> None:
-    filename = str(path.absolute())
-    key = str(Path(site_name) / path.name)
-    if bucket_directory:
-        key = bucket_directory + "/" + key
-    print(f"Uploading {key}")
-    bucket.upload_file(Filename=filename, Key=key)
-    os.remove(path)
-
-
-def push_backup(args: Arguments) -> None:
-    """Get latest backup files using Frappe utils, push them to S3 and remove local copy"""
-
-    files = get_files_from_previous_backup(args.site)
-    bucket = get_bucket(args)
-
-    for path in files:
-        upload_file(
-            path=path,
-            site_name=args.site,
-            bucket=bucket,
-            bucket_directory=args.bucket_directory,
-        )
-
-    print("Done!")
-
-
-def parse_args(args: list[str]) -> Arguments:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--site", required=True)
-    parser.add_argument("--bucket", required=True)
-    parser.add_argument("--region-name", required=True)
-    parser.add_argument("--endpoint-url", required=True)
-    # Looking for default AWS credentials variables
-    parser.add_argument(
-        "--aws-access-key-id", required=True, default=os.getenv("AWS_ACCESS_KEY_ID")
-    )
-    parser.add_argument(
-        "--aws-secret-access-key",
-        required=True,
-        default=os.getenv("AWS_SECRET_ACCESS_KEY"),
-    )
-    parser.add_argument("--bucket-directory")
-    return parser.parse_args(args, namespace=Arguments())
-
-
-def main(args: list[str]) -> int:
-    push_backup(parse_args(args))
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main(sys.argv[1:]))

install_x11_deps.sh

@@ -0,0 +1,104 @@
+#!/bin/bash
+set -e
+# This script configures X11 forwarding for Linux and macOS systems.
+# It installs X11, Openbox (on Linux), and checks for XQuartz (on macOS).
+# It also updates the sshd_config file to enable X11Forwarding and restarts the SSH service.
+
+# Check if the script is running with root privileges
+if [ "$EUID" -ne 0 ]; then
+  echo "Error: This script requires root privileges. Please run it as a superuser"
+  exit 1
+fi
+
+# Function to restart SSH service (Linux)
+restart_ssh_linux() {
+  if command -v service >/dev/null 2>&1; then
+    sudo service ssh restart
+  else
+    sudo systemctl restart ssh
+  fi
+}
+
+# Function to restart SSH service (macOS)
+restart_ssh_macos() {
+  launchctl stop com.openssh.sshd
+  launchctl start com.openssh.sshd
+}
+
+update_x11_forwarding() {
+  if grep -q "X11Forwarding yes" /etc/ssh/sshd_config; then
+    echo "X11Forwarding is already set to 'yes' in ssh_config."
+  else
+    if [[ "$OSTYPE" == "linux-gnu" ]]; then
+      # Linux: Use sed for Linux
+      sudo sed -i 's/#\?X11Forwarding.*/X11Forwarding yes/' /etc/ssh/sshd_config
+    elif [[ "$OSTYPE" == "darwin"* ]]; then
+      # macOS: Use sed for macOS
+      sudo sed -i -E 's/#X11Forwarding.*/X11Forwarding yes/' /etc/ssh/sshd_config
+      restart_ssh_macos
+    fi
+    if [[ "$OSTYPE" == "linux-gnu" ]]; then
+      restart_ssh_linux
+    fi
+  fi
+}
+
+# Determine the operating system
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+  # Linux
+  if command -v startx >/dev/null 2>&1; then
+    echo "X11 is already installed."
+  else
+    # Check which package manager is available
+    if command -v apt-get >/dev/null 2>&1; then
+      install_command="sudo apt-get update && sudo apt-get install xorg openbox"
+    elif command -v dnf >/dev/null 2>&1; then
+      install_command="sudo dnf install xorg-x11-server-Xorg openbox"
+    else
+      echo "Error: Unable to determine the package manager. Manual installation required."
+      exit 1
+    fi
+  fi
+  # Check if the installation command is defined
+  if [ -n "$install_command" ]; then
+    # Execute the installation command
+    if $install_command; then
+      echo "X11 and Openbox have been successfully installed."
+    else
+      echo "Error: Failed to install X11 and Openbox."
+      exit 1
+    fi
+  else
+    echo "Error: Unsupported package manager."
+    exit 1
+  fi
+
+  # Call the function to update X11Forwarding
+  update_x11_forwarding
+
+  # Get the IP address of the host dynamically
+  host_ip=$(hostname -I | awk '{print $1}')
+  xhost + "$host_ip" && xhost + local:
+  # Set the DISPLAY variable to the host IP
+  export DISPLAY="$host_ip:0.0"
+  echo "DISPLAY variable set to $DISPLAY"
+
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  # macOS
+  if command -v xquartz >/dev/null 2>&1; then
+    echo "XQuartz is already installed."
+  else
+    echo "Error: XQuartz is required for X11 forwarding on macOS. Please install XQuartz manually."
+    exit 1
+  fi
+
+  # Call the function to update X11Forwarding
+  update_x11_forwarding
+
+  # Export the DISPLAY variable for macOS
+  export DISPLAY=:0
+  echo "DISPLAY variable set to $DISPLAY"
+else
+  echo "Error: Unsupported operating system."
+  exit 1
+fi

overrides/compose.backup-cron.yaml

@@ -0,0 +1,15 @@
+services:
+  cron:
+    image: mcuadros/ofelia:latest
+    depends_on:
+      - scheduler
+    command: daemon --docker
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+
+  scheduler:
+    labels:
+      ofelia.enabled: "true"
+      ofelia.job-exec.datecron.schedule: "${BACKUP_CRONSTRING:-@every 6h}"
+      ofelia.job-exec.datecron.command: "bench --site all backup"
+      ofelia.job-exec.datecron.user: "frappe"

overrides/compose.erpnext.yaml

@@ -1,24 +0,0 @@
-x-erpnext-backend-image: &erpnext_backend_image
-  image: frappe/erpnext-worker:${ERPNEXT_VERSION:?No ERPNext version set}
-
-services:
-  configurator:
-    <<: *erpnext_backend_image
-
-  backend:
-    <<: *erpnext_backend_image
-
-  frontend:
-    image: frappe/erpnext-nginx:${ERPNEXT_VERSION}
-
-  queue-short:
-    <<: *erpnext_backend_image
-
-  queue-default:
-    <<: *erpnext_backend_image
-
-  queue-long:
-    <<: *erpnext_backend_image
-
-  scheduler:
-    <<: *erpnext_backend_image

overrides/compose.https.yaml

@@ -5,10 +5,11 @@ services:
       - traefik.http.services.frontend.loadbalancer.server.port=8080
       - traefik.http.routers.frontend-http.entrypoints=websecure
       - traefik.http.routers.frontend-http.tls.certresolver=main-resolver
-      - traefik.http.routers.frontend-http.rule=HostRegexp(`{any:.+}`)
+      - traefik.http.routers.frontend-http.rule=Host(${SITES:?List of sites not set})
 
   proxy:
-    image: traefik:2.5
+    image: traefik:v2.11
+    restart: unless-stopped
     command:
       - --providers.docker=true
       - --providers.docker.exposedbydefault=false
@@ -21,8 +22,8 @@ services:
       - --certificatesResolvers.main-resolver.acme.email=${LETSENCRYPT_EMAIL:?No Let's Encrypt email set}
       - --certificatesResolvers.main-resolver.acme.storage=/letsencrypt/acme.json
     ports:
-      - 80:80
-      - 443:443
+      - ${HTTP_PUBLISH_PORT:-80}:80
+      - ${HTTPS_PUBLISH_PORT:-443}:443
     volumes:
       - cert-data:/letsencrypt
       - /var/run/docker.sock:/var/run/docker.sock:ro

overrides/compose.mariadb-shared.yaml

@@ -8,7 +8,7 @@ services:
     healthcheck:
       test: mysqladmin ping -h localhost --password=${DB_PASSWORD:-changeit}
       interval: 1s
-      retries: 15
+      retries: 20
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci
@@ -17,7 +17,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit}
     volumes:
-      - ${HOME}/data/mariadb:/var/lib/mysql
+      - db-data:/var/lib/mysql
     networks:
       - mariadb-network
 
@@ -25,3 +25,6 @@ networks:
   mariadb-network:
     name: mariadb-network
     external: false
+
+volumes:
+  db-data:

overrides/compose.mariadb.yaml

@@ -12,7 +12,8 @@ services:
     healthcheck:
       test: mysqladmin ping -h localhost --password=${DB_PASSWORD}
       interval: 1s
-      retries: 15
+      retries: 20
+    restart: unless-stopped
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci

overrides/compose.multi-bench.yaml

@@ -26,18 +26,20 @@ services:
     networks:
       - bench-network
       - mariadb-network
-  queue-default:
-    networks:
-      - bench-network
-      - mariadb-network
   queue-short:
     networks:
       - bench-network
+      - mariadb-network
   queue-long:
     networks:
       - bench-network
       - mariadb-network
-  redis:
+  redis-cache:
+    networks:
+      - bench-network
+      - mariadb-network
+
+  redis-queue:
     networks:
       - bench-network
       - mariadb-network

overrides/compose.noproxy.yaml

@@ -1,4 +1,4 @@
 services:
   frontend:
     ports:
-      - 8080:8080
+      - ${HTTP_PUBLISH_PORT:-8080}:8080

overrides/compose.postgres.yaml

@@ -12,7 +12,7 @@ services:
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD:?No db password set}
     volumes:
-      - db-data:/var/lib/postgresql
+      - db-data:/var/lib/postgresql/data
 
 volumes:
   db-data:

overrides/compose.proxy.yaml

@@ -7,13 +7,13 @@ services:
       - traefik.http.routers.frontend-http.rule=HostRegexp(`{any:.+}`)
 
   proxy:
-    image: traefik:2.5
+    image: traefik:v2.11
     command:
       - --providers.docker
       - --providers.docker.exposedbydefault=false
       - --entrypoints.web.address=:80
     ports:
-      - 80:80
+      - ${HTTP_PUBLISH_PORT:-80}:80
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     userns_mode: host

overrides/compose.redis.yaml

@@ -1,16 +1,21 @@
 services:
   configurator:
     environment:
-      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
     depends_on:
-      - redis
+      - redis-cache
+      - redis-queue
 
-  redis:
+  redis-cache:
     image: redis:6.2-alpine
+    restart: unless-stopped
+
+  redis-queue:
+    image: redis:6.2-alpine
+    restart: unless-stopped
     volumes:
-      - redis-data:/data
+      - redis-queue-data:/data
 
 volumes:
-  redis-data:
+  redis-queue-data:

overrides/compose.traefik-ssl.yaml

@@ -2,7 +2,7 @@ services:
   traefik:
     labels:
       # https-redirect middleware to redirect HTTP to HTTPS
-      # It can be re-used by other stacks in other Docker Compose files
+      # It can be reused by other stacks in other Docker Compose files
       - traefik.http.middlewares.https-redirect.redirectscheme.scheme=https
       - traefik.http.middlewares.https-redirect.redirectscheme.permanent=true
       # traefik-http to use the middleware to redirect to https
@@ -40,6 +40,9 @@ services:
       # Enable the Dashboard and API
       - --api
     ports:
-      - 443:443
+      - ${HTTPS_PUBLISH_PORT:-443}:443
     volumes:
-      - ${HOME}/data/traefik/certificates:/certificates
+      - cert-data:/certificates
+
+volumes:
+  cert-data:

overrides/compose.traefik.yaml

@@ -2,7 +2,8 @@ version: "3.3"
 
 services:
   traefik:
-    image: "traefik:v2.6"
+    image: "traefik:v2.11"
+    restart: unless-stopped
     labels:
       # Enable Traefik for this service, to make it available in the public network
       - traefik.enable=true
@@ -34,7 +35,7 @@ services:
       # Enable the Dashboard and API
       - --api
     ports:
-      - 80:80
+      - ${HTTP_PUBLISH_PORT:-80}:80
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:

pwd.yml

@@ -2,36 +2,60 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext:v15.54.4
+    networks:
+      - frappe_network
     deploy:
       restart_policy:
         condition: on-failure
     volumes:
       - sites:/home/frappe/frappe-bench/sites
-      - assets:/home/frappe/frappe-bench/sites/assets
+      - logs:/home/frappe/frappe-bench/logs
+    environment:
+      DB_HOST: db
+      DB_PORT: "3306"
+      MYSQL_ROOT_PASSWORD: admin
+      MARIADB_ROOT_PASSWORD: admin
 
   configurator:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext:v15.54.4
+    networks:
+      - frappe_network
+    deploy:
+      restart_policy:
+        condition: none
+    entrypoint:
+      - bash
+      - -c
     command:
-      - configure.py
+      - >
+        ls -1 apps > sites/apps.txt;
+        bench set-config -g db_host $$DB_HOST;
+        bench set-config -gp db_port $$DB_PORT;
+        bench set-config -g redis_cache "redis://$$REDIS_CACHE";
+        bench set-config -g redis_queue "redis://$$REDIS_QUEUE";
+        bench set-config -g redis_socketio "redis://$$REDIS_QUEUE";
+        bench set-config -gp socketio_port $$SOCKETIO_PORT;
     environment:
       DB_HOST: db
       DB_PORT: "3306"
       REDIS_CACHE: redis-cache:6379
       REDIS_QUEUE: redis-queue:6379
-      REDIS_SOCKETIO: redis-socketio:6379
       SOCKETIO_PORT: "9000"
     volumes:
       - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext:v15.54.4
+    networks:
+      - frappe_network
     deploy:
       restart_policy:
-        condition: on-failure
+        condition: none
     volumes:
       - sites:/home/frappe/frappe-bench/sites
-      - assets:/home/frappe/frappe-bench/sites/assets
+      - logs:/home/frappe/frappe-bench/logs
     entrypoint:
       - bash
       - -c
@@ -40,28 +64,29 @@ services:
         wait-for-it -t 120 db:3306;
         wait-for-it -t 120 redis-cache:6379;
         wait-for-it -t 120 redis-queue:6379;
-        wait-for-it -t 120 redis-socketio:6379;
         export start=`date +%s`;
-        until [[ -n `grep -hs ^ common_site_config.json | jq -r ".db_host // empty"` ]] && \
-          [[ -n `grep -hs ^ common_site_config.json | jq -r ".redis_cache // empty"` ]] && \
-          [[ -n `grep -hs ^ common_site_config.json | jq -r ".redis_queue // empty"` ]];
+        until [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".db_host // empty"` ]] && \
+          [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_cache // empty"` ]] && \
+          [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_queue // empty"` ]];
         do
-          echo "Waiting for common_site_config.json to be created";
+          echo "Waiting for sites/common_site_config.json to be created";
           sleep 5;
           if (( `date +%s`-start > 120 )); then
-            echo "could not find common_site_config.json with required keys";
+            echo "could not find sites/common_site_config.json with required keys";
             exit 1
           fi
         done;
-        echo "common_site_config.json found";
-        bench new-site frontend --admin-password=admin --db-root-password=admin --install-app payments --install-app erpnext --set-default;
+        echo "sites/common_site_config.json found";
+        bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-username=root --db-root-password=admin --install-app erpnext --set-default frontend;
 
   db:
     image: mariadb:10.6
+    networks:
+      - frappe_network
     healthcheck:
       test: mysqladmin ping -h localhost --password=admin
       interval: 1s
-      retries: 15
+      retries: 20
     deploy:
       restart_policy:
         condition: on-failure
@@ -72,14 +97,21 @@ services:
       - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
     environment:
       MYSQL_ROOT_PASSWORD: admin
+      MARIADB_ROOT_PASSWORD: admin
     volumes:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v14.0.2
+    image: frappe/erpnext:v15.54.4
+    networks:
+      - frappe_network
+    depends_on:
+      - websocket
     deploy:
       restart_policy:
         condition: on-failure
+    command:
+      - nginx-entrypoint.sh
     environment:
       BACKEND: backend:8000
       FRAPPE_SITE_NAME_HEADER: frontend
@@ -87,27 +119,18 @@ services:
       UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
       UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
       UPSTREAM_REAL_IP_RECURSIVE: "off"
+      PROXY_READ_TIMEOUT: 120
+      CLIENT_MAX_BODY_SIZE: 50m
     volumes:
-      - sites:/usr/share/nginx/html/sites
-      - assets:/usr/share/nginx/html/assets
+      - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
     ports:
       - "8080:8080"
 
-  queue-default:
-    image: frappe/erpnext-worker:v14.0.2
-    deploy:
-      restart_policy:
-        condition: on-failure
-    command:
-      - bench
-      - worker
-      - --queue
-      - default
-    volumes:
-      - sites:/home/frappe/frappe-bench/sites
-
   queue-long:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext:v15.54.4
+    networks:
+      - frappe_network
     deploy:
       restart_policy:
         condition: on-failure
@@ -115,12 +138,15 @@ services:
       - bench
       - worker
       - --queue
-      - long
+      - long,default,short
     volumes:
       - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext-worker:v14.0.2
+    image: frappe/erpnext:v15.54.4
+    networks:
+      - frappe_network
     deploy:
       restart_policy:
         condition: on-failure
@@ -128,12 +154,15 @@ services:
       - bench
       - worker
       - --queue
-      - short
+      - short,default
     volumes:
       - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
 
   redis-queue:
     image: redis:6.2-alpine
+    networks:
+      - frappe_network
     deploy:
       restart_policy:
         condition: on-failure
@@ -142,22 +171,16 @@ services:
 
   redis-cache:
     image: redis:6.2-alpine
+    networks:
+      - frappe_network
     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:v14.0.2
+    image: frappe/erpnext:v15.54.4
+    networks:
+      - frappe_network
     deploy:
       restart_policy:
         condition: on-failure
@@ -166,19 +189,28 @@ services:
       - schedule
     volumes:
       - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/frappe-socketio:v14.4.3
+    image: frappe/erpnext:v15.54.4
+    networks:
+      - frappe_network
     deploy:
       restart_policy:
         condition: on-failure
+    command:
+      - node
+      - /home/frappe/frappe-bench/apps/frappe/socketio.js
     volumes:
       - sites:/home/frappe/frappe-bench/sites
+      - logs:/home/frappe/frappe-bench/logs
 
 volumes:
-  assets:
   db-data:
   redis-queue-data:
-  redis-cache-data:
-  redis-socketio-data:
   sites:
+  logs:
+
+networks:
+  frappe_network:
+    driver: bridge

requirements-dev.txt

@@ -1,3 +0,0 @@
-frappe @ git+https://github.com/frappe/frappe.git
-boto3-stubs[s3]
-black==22.6.0

requirements-test.txt

@@ -1 +1 @@
-pytest==7.1.2
+pytest==8.3.5

resources/nginx-entrypoint.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Set variables that do not exist
+if [[ -z "$BACKEND" ]]; then
+  echo "BACKEND defaulting to 0.0.0.0:8000"
+  export BACKEND=0.0.0.0:8000
+fi
+if [[ -z "$SOCKETIO" ]]; then
+  echo "SOCKETIO defaulting to 0.0.0.0:9000"
+  export SOCKETIO=0.0.0.0:9000
+fi
+if [[ -z "$UPSTREAM_REAL_IP_ADDRESS" ]]; then
+  echo "UPSTREAM_REAL_IP_ADDRESS defaulting to 127.0.0.1"
+  export UPSTREAM_REAL_IP_ADDRESS=127.0.0.1
+fi
+if [[ -z "$UPSTREAM_REAL_IP_HEADER" ]]; then
+  echo "UPSTREAM_REAL_IP_HEADER defaulting to X-Forwarded-For"
+  export UPSTREAM_REAL_IP_HEADER=X-Forwarded-For
+fi
+if [[ -z "$UPSTREAM_REAL_IP_RECURSIVE" ]]; then
+  echo "UPSTREAM_REAL_IP_RECURSIVE defaulting to off"
+  export UPSTREAM_REAL_IP_RECURSIVE=off
+fi
+if [[ -z "$FRAPPE_SITE_NAME_HEADER" ]]; then
+  # shellcheck disable=SC2016
+  echo 'FRAPPE_SITE_NAME_HEADER defaulting to $host'
+  # shellcheck disable=SC2016
+  export FRAPPE_SITE_NAME_HEADER='$host'
+fi
+
+if [[ -z "$PROXY_READ_TIMEOUT" ]]; then
+  echo "PROXY_READ_TIMEOUT defaulting to 120"
+  export PROXY_READ_TIMEOUT=120
+fi
+
+if [[ -z "$CLIENT_MAX_BODY_SIZE" ]]; then
+  echo "CLIENT_MAX_BODY_SIZE defaulting to 50m"
+  export CLIENT_MAX_BODY_SIZE=50m
+fi
+
+# shellcheck disable=SC2016
+envsubst '${BACKEND}
+  ${SOCKETIO}
+  ${UPSTREAM_REAL_IP_ADDRESS}
+  ${UPSTREAM_REAL_IP_HEADER}
+  ${UPSTREAM_REAL_IP_RECURSIVE}
+  ${FRAPPE_SITE_NAME_HEADER}
+  ${PROXY_READ_TIMEOUT}
+	${CLIENT_MAX_BODY_SIZE}' \
+  </templates/nginx/frappe.conf.template >/etc/nginx/conf.d/frappe.conf
+
+nginx -g 'daemon off;'

resources/nginx-template.conf

@@ -6,16 +6,10 @@ upstream socketio-server {
 	server ${SOCKETIO} fail_timeout=0;
 }
 
-# Parse the X-Forwarded-Proto header - if set - defaulting to $scheme.
-map $http_x_forwarded_proto $proxy_x_forwarded_proto {
-	default $scheme;
-	https https;
-}
-
 server {
 	listen 8080;
-	server_name $http_host;
-	root /usr/share/nginx/html;
+	server_name ${FRAPPE_SITE_NAME_HEADER};
+	root /home/frappe/frappe-bench/sites;
 
 	proxy_buffer_size 128k;
 	proxy_buffers 4 256k;
@@ -37,13 +31,11 @@ server {
 
 	location ~ ^/protected/(.*) {
 		internal;
-		try_files /sites/$http_host/$1 =404;
+		try_files /${FRAPPE_SITE_NAME_HEADER}/$1 =404;
 	}
 
 	location /socket.io {
 		proxy_http_version 1.1;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection "upgrade";
 		proxy_set_header X-Frappe-Site-Name ${FRAPPE_SITE_NAME_HEADER};
@@ -54,40 +46,35 @@ server {
 	}
 
 	location / {
-		rewrite ^(.+)/$ $proxy_x_forwarded_proto://$http_host$1 permanent;
-		rewrite ^(.+)/index\.html$ $proxy_x_forwarded_proto://$http_host$1 permanent;
-		rewrite ^(.+)\.html$ $proxy_x_forwarded_proto://$http_host$1 permanent;
+		rewrite ^(.+)/$ $1 permanent;
+		rewrite ^(.+)/index\.html$ $1 permanent;
+		rewrite ^(.+)\.html$ $1 permanent;
 
 		location ~ ^/files/.*.(htm|html|svg|xml) {
 			add_header Content-disposition "attachment";
-			try_files /sites/${FRAPPE_SITE_NAME_HEADER}/public/$uri @webserver;
+			try_files /${FRAPPE_SITE_NAME_HEADER}/public/$uri @webserver;
 		}
 
-		try_files /sites/${FRAPPE_SITE_NAME_HEADER}/public/$uri @webserver;
+		try_files /${FRAPPE_SITE_NAME_HEADER}/public/$uri @webserver;
 	}
 
 	location @webserver {
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
+		proxy_http_version 1.1;
+		proxy_set_header X-Forwarded-For $remote_addr;
+		proxy_set_header X-Forwarded-Proto $scheme;
 		proxy_set_header X-Frappe-Site-Name ${FRAPPE_SITE_NAME_HEADER};
 		proxy_set_header Host $host;
 		proxy_set_header X-Use-X-Accel-Redirect True;
-		proxy_read_timeout 120;
+		proxy_read_timeout ${PROXY_READ_TIMEOUT};
 		proxy_redirect off;
 
 		proxy_pass  http://backend-server;
 	}
 
-	# error pages
-	error_page 502 /502.html;
-	location /502.html {
-		internal;
-	}
-
 	# optimizations
 	sendfile on;
 	keepalive_timeout 15;
-	client_max_body_size 50m;
+	client_max_body_size ${CLIENT_MAX_BODY_SIZE};
 	client_body_buffer_size 16K;
 	client_header_buffer_size 1k;
 

tests/_check_backup_files.py

@@ -1,69 +0,0 @@
-import os
-import re
-from typing import TYPE_CHECKING
-
-import boto3
-
-if TYPE_CHECKING:
-    from mypy_boto3_s3.service_resource import BucketObjectsCollection, _Bucket
-
-
-def get_bucket() -> "_Bucket":
-    return boto3.resource(
-        service_name="s3",
-        endpoint_url="http://minio:9000",
-        region_name="us-east-1",
-        aws_access_key_id=os.getenv("S3_ACCESS_KEY"),
-        aws_secret_access_key=os.getenv("S3_SECRET_KEY"),
-    ).Bucket("frappe")
-
-
-def get_key_builder():
-    site_name = os.getenv("SITE_NAME")
-    assert site_name
-
-    def builder(key: str, suffix: str) -> bool:
-        return bool(re.match(rf"{site_name}.*{suffix}$", key))
-
-    return builder
-
-
-def check_keys(objects: "BucketObjectsCollection"):
-    check_key = get_key_builder()
-
-    db = False
-    config = False
-    private_files = False
-    public_files = False
-
-    for obj in objects:
-        if check_key(obj.key, "database.sql.gz"):
-            db = True
-        elif check_key(obj.key, "site_config_backup.json"):
-            config = True
-        elif check_key(obj.key, "private-files.tar"):
-            private_files = True
-        elif check_key(obj.key, "files.tar"):
-            public_files = True
-
-    exc = lambda type_: Exception(f"Didn't push {type_} backup")
-    if not db:
-        raise exc("database")
-    if not config:
-        raise exc("site config")
-    if not private_files:
-        raise exc("private files")
-    if not public_files:
-        raise exc("public files")
-
-    print("All files were pushed to S3!")
-
-
-def main() -> int:
-    bucket = get_bucket()
-    check_keys(bucket.objects.all())
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

tests/_check_connections.py

@@ -31,7 +31,7 @@ def get_redis_url(addr: str) -> Address:
 
 def get_addresses(config: dict[str, Any]) -> Iterable[Address]:
     yield (config["db_host"], config["db_port"])
-    for key in ("redis_cache", "redis_queue", "redis_socketio"):
+    for key in ("redis_cache", "redis_queue"):
         yield get_redis_url(config[key])
 
 

tests/_ping_frappe_connections.py

@@ -16,7 +16,7 @@ def check_cache():
 
 
 def main() -> int:
-    frappe.connect(site="tests")
+    frappe.connect(site="tests.localhost")
     check_db()
     check_cache()
     return 0

tests/compose.ci-erpnext.yaml

@@ -1,24 +0,0 @@
-services:
-  configurator:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  backend:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  frontend:
-    image: localhost:5000/frappe/erpnext-nginx:${ERPNEXT_VERSION}
-
-  websocket:
-    image: localhost:5000/frappe/frappe-socketio:${FRAPPE_VERSION}
-
-  queue-short:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  queue-default:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  queue-long:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-  scheduler:
-    image: localhost:5000/frappe/erpnext-worker:${ERPNEXT_VERSION}

tests/compose.ci.yaml

@@ -1,24 +1,21 @@
 services:
   configurator:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION}
 
   backend:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION}
 
   frontend:
-    image: localhost:5000/frappe/frappe-nginx:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION}
 
   websocket:
-    image: localhost:5000/frappe/frappe-socketio:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION}
 
   queue-short:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
-
-  queue-default:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION}
 
   queue-long:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION}
 
   scheduler:
-    image: localhost:5000/frappe/frappe-worker:${FRAPPE_VERSION}
+    image: localhost:5000/frappe/erpnext:${ERPNEXT_VERSION}

tests/conftest.py

@@ -1,4 +1,5 @@
 import os
+import re
 import shutil
 import subprocess
 from dataclasses import dataclass
@@ -22,12 +23,27 @@ def _add_version_var(name: str, env_path: Path):
         f.write(f"\n{name}={os.environ[name]}")
 
 
+def _add_sites_var(env_path: Path):
+    with open(env_path, "r+") as f:
+        content = f.read()
+        content = re.sub(
+            rf"SITES=.*",
+            f"SITES=`tests.localhost`,`test-erpnext-site.localhost`,`test-pg-site.localhost`",
+            content,
+        )
+        f.seek(0)
+        f.truncate()
+        f.write(content)
+
+
 @pytest.fixture(scope="session")
 def env_file(tmp_path_factory: pytest.TempPathFactory):
     tmp_path = tmp_path_factory.mktemp("frappe-docker")
     file_path = tmp_path / ".env"
     shutil.copy("example.env", file_path)
 
+    _add_sites_var(file_path)
+
     for var in ("FRAPPE_VERSION", "ERPNEXT_VERSION"):
         _add_version_var(name=var, env_path=file_path)
 
@@ -52,14 +68,14 @@ def frappe_setup(compose: Compose):
 
 @pytest.fixture(scope="session")
 def frappe_site(compose: Compose):
-    site_name = "tests"
+    site_name = "tests.localhost"
     compose.bench(
         "new-site",
+        # TODO: change to --mariadb-user-host-login-scope=%
+        "--no-mariadb-socket",
+        "--db-root-password=123",
+        "--admin-password=admin",
         site_name,
-        "--mariadb-root-password",
-        "123",
-        "--admin-password",
-        "admin",
     )
     compose("restart", "backend")
     yield site_name
@@ -68,11 +84,7 @@ def frappe_site(compose: Compose):
 @pytest.fixture(scope="class")
 def erpnext_setup(compose: Compose):
     compose.stop()
-
-    args = ["-f", "overrides/compose.erpnext.yaml"]
-    if CI:
-        args += ("-f", "tests/compose.ci-erpnext.yaml")
-    compose(*args, "up", "-d", "--quiet-pull")
+    compose("up", "-d", "--quiet-pull")
 
     yield
     compose.stop()
@@ -80,23 +92,16 @@ def erpnext_setup(compose: Compose):
 
 @pytest.fixture(scope="class")
 def erpnext_site(compose: Compose):
-    site_name = "test_erpnext_site"
+    site_name = "test-erpnext-site.localhost"
     args = [
         "new-site",
+        # TODO: change to --mariadb-user-host-login-scope=%
+        "--no-mariadb-socket",
+        "--db-root-password=123",
+        "--admin-password=admin",
+        "--install-app=erpnext",
         site_name,
-        "--mariadb-root-password",
-        "123",
-        "--admin-password",
-        "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

tests/test_frappe_docker.py

@@ -10,7 +10,6 @@ from tests.utils import Compose, check_url_content
 BACKEND_SERVICES = (
     "backend",
     "queue-short",
-    "queue-default",
     "queue-long",
     "scheduler",
 )
@@ -39,7 +38,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(
@@ -89,44 +88,31 @@ def test_frappe_connections_in_backends(
 ):
     filename = "_ping_frappe_connections.py"
     compose("cp", f"tests/{filename}", f"{service}:/tmp/")
-    compose.exec(service, python_path, f"/tmp/{filename}")
+    compose.exec(
+        "-w",
+        "/home/frappe/frappe-bench/sites",
+        service,
+        python_path,
+        f"/tmp/{filename}",
+    )
 
 
 def test_push_backup(
-    python_path: str,
     frappe_site: str,
     s3_service: S3ServiceResult,
     compose: Compose,
 ):
+    restic_password = "secret"
     compose.bench("--site", frappe_site, "backup", "--with-files")
-    compose.exec(
-        "backend",
-        "push-backup",
-        "--site",
-        frappe_site,
-        "--bucket",
-        "frappe",
-        "--region-name",
-        "us-east-1",
-        "--endpoint-url",
-        "http://minio:9000",
-        "--aws-access-key-id",
-        s3_service.access_key,
-        "--aws-secret-access-key",
-        s3_service.secret_key,
-    )
-    compose("cp", "tests/_check_backup_files.py", "backend:/tmp")
-    compose.exec(
-        "-e",
-        f"S3_ACCESS_KEY={s3_service.access_key}",
-        "-e",
-        f"S3_SECRET_KEY={s3_service.secret_key}",
-        "-e",
-        f"SITE_NAME={frappe_site}",
-        "backend",
-        python_path,
-        "/tmp/_check_backup_files.py",
-    )
+    restic_args = [
+        "--env=RESTIC_REPOSITORY=s3:http://minio:9000/frappe",
+        f"--env=AWS_ACCESS_KEY_ID={s3_service.access_key}",
+        f"--env=AWS_SECRET_ACCESS_KEY={s3_service.secret_key}",
+        f"--env=RESTIC_PASSWORD={restic_password}",
+    ]
+    compose.exec(*restic_args, "backend", "restic", "init")
+    compose.exec(*restic_args, "backend", "restic", "backup", "sites")
+    compose.exec(*restic_args, "backend", "restic", "snapshots")
 
 
 def test_https(frappe_site: str, compose: Compose):
@@ -140,7 +126,7 @@ class TestErpnext:
         ("url", "callback"),
         (
             (
-                "/api/method/erpnext.templates.pages.product_search.get_product_list",
+                "/api/method/erpnext.templates.pages.search_help.get_help_results_sections?text=help",
                 api_cb,
             ),
             ("/assets/erpnext/js/setup_wizard.js", assets_cb),
@@ -157,7 +143,7 @@ class TestPostgres:
     def test_site_creation(self, compose: Compose):
         compose.bench(
             "new-site",
-            "test_pg_site",
+            "test-pg-site.localhost",
             "--db-type",
             "postgres",
             "--admin-password",