Skip to content

Commit

Permalink
a
Browse files Browse the repository at this point in the history
  • Loading branch information
guinanlin committed Sep 25, 2023
1 parent baa3c24 commit b9359a2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
8 changes: 7 additions & 1 deletion erpnext14/Dockerfile-bubbles
Original file line number Diff line number Diff line change
Expand Up @@ -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

# 拷贝基础软件安装脚本
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions erpnext14/installdata/install-erpnext14-ubuntu22.04-bubbles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit b9359a2

Please sign in to comment.