Merge branch 'frappe:main' into main

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
       - id: black
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
 

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

@@ -109,7 +109,7 @@ create-site:
         fi
       done;
       echo "sites/common_site_config.json found";
-      bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app payments --install-app erpnext --set-default;
+      bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default;
 
 # ... removed for brevity
 ```

docs/setup-options.md

@@ -111,16 +111,19 @@ docker compose -f compose.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)

pwd.yml

@@ -67,7 +67,7 @@ services:
           fi
         done;
         echo "sites/common_site_config.json found";
-        bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app payments --install-app erpnext --set-default;
+        bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default;
 
   db:
     image: mariadb:10.6