From 499c1fbed46288045922650a282d67d5e5b365dc Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sat, 28 Jan 2023 12:20:45 +0530
Subject: [PATCH 1/3] fix: remove payments (#1063)

payments is optional dep for erpnext
---
 docs/migrate-from-multi-image-setup.md | 2 +-
 pwd.yml                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/migrate-from-multi-image-setup.md b/docs/migrate-from-multi-image-setup.md
index 5887d0c1..002b5901 100644
--- a/docs/migrate-from-multi-image-setup.md
+++ b/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
 ```
diff --git a/pwd.yml b/pwd.yml
index bbdb799c..898a5222 100644
--- a/pwd.yml
+++ b/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

From 8dce4e5f2c6f9840f7501e0a6ee1376121ff7b7e Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sat, 28 Jan 2023 12:40:46 +0530
Subject: [PATCH 2/3] docs: fix migration steps (#1065)

---
 docs/setup-options.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/setup-options.md b/docs/setup-options.md
index 0fd9fbbe..41693e4c 100644
--- a/docs/setup-options.md
+++ b/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)

From 8342bd93c8b367d5c9979c78c7801ed73f3f988b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 29 Jan 2023 22:43:17 +0530
Subject: [PATCH 3/3] chore(deps): Update pre-commit hooks (#1066)

Co-authored-by: vrslev <vrslev@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3cfbadb1..6130f0af 100644
--- a/.pre-commit-config.yaml
+++ b/.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