Shiloh/frappe_docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch back to https for erpnext repo

Browse Source
This commit is contained in:
PAlexanderFranklin 2024-03-22 14:08:45 -07:00
parent 0f566169e2
commit 4b8817c7a4
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shilohimage
View File

@ -104,7 +104,7 @@ RUN echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /home/frappe/.ssh/config
ARG FRAPPE_BRANCH=version-15 ARG FRAPPE_BRANCH=version-15
ARG FRAPPE_PATH=https://github.com/frappe/frappe ARG FRAPPE_PATH=https://github.com/frappe/frappe
ARG ERPNEXT_REPO=git@githaven.org:2222/Shiloh/brotherton-erpnext.git ARG ERPNEXT_REPO=https://githaven.org/Shiloh/brotherton-erpnext.git
ARG ERPNEXT_BRANCH=production ARG ERPNEXT_BRANCH=production
# RUN ssh -T ${ERPNEXT_REPO} # RUN ssh -T ${ERPNEXT_REPO}
RUN bench init \ RUN bench init \
@ -116,7 +116,7 @@ RUN bench init \
--verbose \ --verbose \
/home/frappe/frappe-bench && \ /home/frappe/frappe-bench && \
cd /home/frappe/frappe-bench && \ cd /home/frappe/frappe-bench && \
--mount=type=ssh bench get-app --branch=${ERPNEXT_BRANCH} --resolve-deps erpnext ssh://${ERPNEXT_REPO} && \ bench get-app --branch=${ERPNEXT_BRANCH} --resolve-deps erpnext ${ERPNEXT_REPO} && \
echo "{}" > sites/common_site_config.json && \ echo "{}" > sites/common_site_config.json && \
find apps -mindepth 1 -path "*/.git" | xargs rm -fr find apps -mindepth 1 -path "*/.git" | xargs rm -fr

11
easy-installer.py
View File

@ -192,17 +192,6 @@ def setup_prod(
sys.stdout.write(line) sys.stdout.write(line)
try: try:
# Starting with generated compose file
subprocess.run(
[
which("docker"),
"compose",
"build",
"--ssh",
"default=$HOME/.ssh/brothertonerpprod_ed25519",
],
check=True,
)
subprocess.run( subprocess.run(
[ [
which("docker"), which("docker"),