From 4b8817c7a41343abfbddad0d763a391819868273 Mon Sep 17 00:00:00 2001 From: PAlexanderFranklin Date: Fri, 22 Mar 2024 14:08:45 -0700 Subject: [PATCH] Switch back to https for erpnext repo --- Shilohimage | 4 ++-- easy-installer.py | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Shilohimage b/Shilohimage index e21b3b0b..056a6bfa 100644 --- a/Shilohimage +++ b/Shilohimage @@ -104,7 +104,7 @@ RUN echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /home/frappe/.ssh/config ARG FRAPPE_BRANCH=version-15 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 # RUN ssh -T ${ERPNEXT_REPO} RUN bench init \ @@ -116,7 +116,7 @@ RUN bench init \ --verbose \ /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 && \ find apps -mindepth 1 -path "*/.git" | xargs rm -fr diff --git a/easy-installer.py b/easy-installer.py index 31e62c91..022d41dc 100644 --- a/easy-installer.py +++ b/easy-installer.py @@ -192,17 +192,6 @@ def setup_prod( sys.stdout.write(line) try: - # Starting with generated compose file - subprocess.run( - [ - which("docker"), - "compose", - "build", - "--ssh", - "default=$HOME/.ssh/brothertonerpprod_ed25519", - ], - check=True, - ) subprocess.run( [ which("docker"),