From b9359a2e007862c787fbf15bd1ab9501cdff64e1 Mon Sep 17 00:00:00 2001
From: "guinan.lin" <guinan.lin@foxmail.com>
Date: Mon, 25 Sep 2023 19:05:01 +0800
Subject: [PATCH] a

---
 erpnext14/Dockerfile-bubbles                         |  8 +++++++-
 .../install-erpnext14-ubuntu22.04-bubbles.sh         | 12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/erpnext14/Dockerfile-bubbles b/erpnext14/Dockerfile-bubbles
index 64188a8c4e..5e1635015b 100644
--- a/erpnext14/Dockerfile-bubbles
+++ b/erpnext14/Dockerfile-bubbles
@@ -5,13 +5,15 @@ LABEL author=guinan.lin
 # 设定参数
 ENV MARIADB_ROOT_PASSWORD=Pass1234
 ENV ADMIN_PASSWORD=admin
+ENV SITE_ANME=site1.local
 
 # mount授权token
 RUN --mount=type=secret,id=GIT_AUTH_TOKEN \
   export GIT_AUTH_TOKEN=$(cat /run/secrets/GIT_AUTH_TOKEN)
 
 ENV GIT_AUTH_TOKEN=${GIT_AUTH_TOKEN}
-  
+ENV ERPNEXTCN_PATH=https://guinanlin:${GIT_AUTH_TOKEN}@github.com/guinanlin/erpnextcn.git
+
 # cat /run/secrets/GIT_AUTH_TOKEN
 
 # 拷贝基础软件安装脚本
@@ -24,6 +26,10 @@ RUN /bin/bash -c "chmod -R 777 /installdata/* && /installdata/install-erpnext14-
 USER frappe
 WORKDIR /home/frappe/frappe-bench
 
+# 安装中国本地化软件
+RUN bench get-app ${ERPNEXTCN_PATH}
+RUN bench --site ${SITE_ANME} install-app erpnextcn
+
 EXPOSE 3306 80
 
 VOLUME /home/frappe/frappe-bench/sites
diff --git a/erpnext14/installdata/install-erpnext14-ubuntu22.04-bubbles.sh b/erpnext14/installdata/install-erpnext14-ubuntu22.04-bubbles.sh
index f5740b2873..71fe6599eb 100644
--- a/erpnext14/installdata/install-erpnext14-ubuntu22.04-bubbles.sh
+++ b/erpnext14/installdata/install-erpnext14-ubuntu22.04-bubbles.sh
@@ -913,12 +913,12 @@ bench get-app ${erpnextBranch} ${erpnextPath}
 # cd ~/${installDir} && ./env/bin/pip3 install -e apps/erpnext/
 EOF
 # 获取ERPNextCN应用
-su - ${userName} <<EOF
-cd ~/${installDir}
-echo "===================获取ERPNextCN应用==================="
-# bench get-app erpnextcn
-bench get-app ${erpnextcnPath}
-EOF
+# su - ${userName} <<EOF
+# cd ~/${installDir}
+# echo "===================获取ERPNextCN应用==================="
+# # bench get-app erpnextcn
+# bench get-app ${erpnextcnPath}
+# EOF
 # 获取Payments应用
 # su - ${userName} <<EOF
 # cd ~/${installDir}