From 82d4412e8fb3398d94d06d4f661394583f415967 Mon Sep 17 00:00:00 2001
From: PAlexanderFranklin <PAlexanderFranklin@gmail.com>
Date: Thu, 16 May 2024 15:25:22 -0700
Subject: [PATCH] Update docker image instructions, add git pull updating
 procedure

---
 README.md | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 787da93b..bbdc0fc8 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ f"SITE_ADMIN_PASS={admin_pass}\n",
   --build-arg=PYTHON_VERSION=3.11.6 \
   --build-arg=NODE_VERSION=18.18.2 \
   --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \
-  --tag=local-frappe \
+  --tag=githaven.org/shiloh/frappe_docker:production \
   --file=images/custom/Containerfile \
   --rm \
   --no-cache \
@@ -101,10 +101,11 @@ f"SITE_ADMIN_PASS={admin_pass}\n",
 
 <!-- Push to githaven -->
 
-sudo docker image tag NAME:TAG githaven.org/shiloh/NAMEOFREPO:TAG
-sudo docker login githaven.org
+<!-- sudo docker image tag NAME:TAG githaven.org/shiloh/frappe_docker:production -->
+
+`sudo docker login githaven.org`
 setup credential service to hide password
-sudo docker push githaven.org/shiloh/NAMEOFREPO:TAG
+`sudo docker push githaven.org/shiloh/frappe_docker:production`
 https://docs.gitea.com/packages/packages/container
 
 <!-- Install erpnext for first time -->
@@ -117,15 +118,23 @@ https://docs.gitea.com/packages/packages/container
 
 Create a project through the dashboard with the sidebar, then login with the admin account and view the projects page through the other dashboard, you should see edits.
 
-To update erpnext, ensure the "backend" container has git repositories in the frappe and erpnext apps:
+<!-- to enter the container: -->
+
+`sudo docker compose -p frappe exec -it backend bash`
+
+To update erpnext, add any commits you want to use to the "production" branch of the erpnext repo on githaven. Then ensure the "backend" container has git repositories in the frappe and erpnext apps:
+`cd ~/frappe-bench/apps/erpnext`
 `git init`
 `git remote add upstream <repo>`
-`git fetch upstream <branch>`
-`git checkout <branch> --force`
+`git fetch upstream production`
+`git checkout production --force`
 `git clean -fd`
 
-Then from ./frappe-bench run:
-`bench update`
+Then pull the latest erpnext, and it will be updated.
+
+<!-- Bench update hangs on node esbuild, so we're just manually pulling the latest changes rather than doing it through this command. -->
+<!-- Then from ./frappe-bench run:
+`bench update` -->
 
 <!-- `sudo docker compose --project-name brotherton -f compose.yaml -f overrides/compose.mariadb.yaml -f overrides/compose.redis.yaml -f overrides/compose.https.yaml --env-file .env config`