Merge branch 'frappe:main' into main

.github/workflows/build_bench.yml

@@ -38,7 +38,7 @@ jobs:
         run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV"
 
       - name: Build and test
-        uses: docker/bake-action@v4.1.0
+        uses: docker/bake-action@v4.3.0
         with:
           targets: bench-test
 
@@ -51,7 +51,7 @@ jobs:
 
       - name: Push
         if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
-        uses: docker/bake-action@v4.1.0
+        uses: docker/bake-action@v4.3.0
         with:
           targets: bench
           push: true

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

@@ -56,7 +56,7 @@ jobs:
           echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV"
 
       - name: Build
-        uses: docker/bake-action@v4.1.0
+        uses: docker/bake-action@v4.3.0
         with:
           push: true
         env:
@@ -84,6 +84,6 @@ jobs:
 
       - name: Push
         if: ${{ inputs.push }}
-        uses: docker/bake-action@v4.1.0
+        uses: docker/bake-action@v4.3.0
         with:
           push: true

.pre-commit-config.yaml

@@ -8,13 +8,13 @@ repos:
       - id: end-of-file-fixer
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
 
   - repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.3.0
     hooks:
       - id: black
 
@@ -47,7 +47,7 @@ repos:
         types: [shell]
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.6
+    rev: v0.10.0.1
     hooks:
       - id: shellcheck
         args: [-x]

README.md

@@ -5,7 +5,7 @@ Everything about [Frappe](https://github.com/frappe/frappe) and [ERPNext](https:
 
 # Getting Started
 
-To get started, you need Docker, docker-compose and git setup on your machine. For Docker basics and best practices. Refer Docker [documentation](http://docs.docker.com).
+To get started you need [Docker](https://docs.docker.com/get-docker/), [docker-compose](https://docs.docker.com/compose/), and [git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git) setup on your machine. For Docker basics and best practices refer to Docker's [documentation](http://docs.docker.com).
 After that, clone this repo:
 
 ```sh

devcontainer-example/devcontainer.json

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

docs/custom-apps.md

@@ -20,10 +20,11 @@ export APPS_JSON='[
     "branch": "version-15"
   },
   {
-    "url": "https://user:password@git.example.com/project/repository.git",
+    "url": "https://{{ PAT }}@git.example.com/project/repository.git",
     "branch": "main"
   }
 ]'
+
 export APPS_JSON_BASE64=$(echo ${APPS_JSON} | base64 -w 0)
 ```
 
@@ -35,7 +36,7 @@ export APPS_JSON_BASE64=$(base64 -w 0 /path/to/apps.json)
 
 Note:
 
-- `url` needs to be http(s) git url with token/auth in case of private repo.
+- `url` needs to be http(s) git url with personal access tokens without username eg:- http://{{PAT}}@github.com/project/repository.git in case of private repo.
 - add dependencies manually in `apps.json` e.g. add `payments` if you are installing `erpnext`
 - use fork repo or branch for ERPNext in case you need to use your fork or test a PR.
 

example.env

@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v15.13.0
+ERPNEXT_VERSION=v15.17.1
 
 DB_PASSWORD=123
 

images/bench/Dockerfile

@@ -69,6 +69,7 @@ RUN apt-get update \
     xz-utils \
     tk-dev \
     liblzma-dev \
+    file \
     && rm -rf /var/lib/apt/lists/*
 
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \

pwd.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v15.13.0
+    image: frappe/erpnext:v15.17.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v15.13.0
+    image: frappe/erpnext:v15.17.1
     deploy:
       restart_policy:
         condition: none
@@ -39,7 +39,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v15.13.0
+    image: frappe/erpnext:v15.17.1
     deploy:
       restart_policy:
         condition: none
@@ -89,7 +89,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v15.13.0
+    image: frappe/erpnext:v15.17.1
     depends_on:
       - websocket
     deploy:
@@ -113,7 +113,7 @@ services:
       - "8080:8080"
 
   queue-long:
-    image: frappe/erpnext:v15.13.0
+    image: frappe/erpnext:v15.17.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -127,7 +127,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v15.13.0
+    image: frappe/erpnext:v15.17.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -157,7 +157,7 @@ services:
       - redis-cache-data:/data
 
   scheduler:
-    image: frappe/erpnext:v15.13.0
+    image: frappe/erpnext:v15.17.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -169,7 +169,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v15.13.0
+    image: frappe/erpnext:v15.17.1
     deploy:
       restart_policy:
         condition: on-failure

requirements-test.txt

@@ -1 +1 @@
-pytest==8.0.0
+pytest==8.1.1