From 39aff8627b008f88f7fc7e30b86d51f301239aba Mon Sep 17 00:00:00 2001 From: everyx Date: Tue, 24 Nov 2020 19:23:54 +0800 Subject: [PATCH 1/5] fix: install app failed when APP_NAME is not same as the one contained in APP_REPO --- build/common/worker/install_app.sh | 2 +- build/erpnext-nginx/install_app.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common/worker/install_app.sh b/build/common/worker/install_app.sh index c378be17..ceb8d3bd 100755 --- a/build/common/worker/install_app.sh +++ b/build/common/worker/install_app.sh @@ -12,5 +12,5 @@ cd ./apps [ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" -git clone --depth 1 -o upstream ${APP_REPO} ${BRANCH} +git clone --depth 1 -o upstream ${APP_REPO} ${BRANCH} ${APP_NAME} pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/${APP_NAME} \ No newline at end of file diff --git a/build/erpnext-nginx/install_app.sh b/build/erpnext-nginx/install_app.sh index 2ce1c447..7af233d2 100755 --- a/build/erpnext-nginx/install_app.sh +++ b/build/erpnext-nginx/install_app.sh @@ -15,7 +15,7 @@ install_packages git python2 mkdir -p apps cd apps git clone --depth 1 https://github.com/frappe/frappe ${BRANCH} -git clone --depth 1 ${APP_REPO} ${BRANCH} +git clone --depth 1 ${APP_REPO} ${BRANCH} ${APP_NAME} cd /home/frappe/frappe-bench/apps/frappe yarn From 8c05801b646d680046c664e6290909f82edd1436 Mon Sep 17 00:00:00 2001 From: manasan3010 Date: Wed, 2 Dec 2020 19:52:40 +0530 Subject: [PATCH 2/5] Update README.MD for clarity Added a warning to prevent a common mistake that I made during my installation. Sourced from https://discuss.erpnext.com/t/how-to-get-started-with-the-official-docker-image/60710/2?u=manasan --- development/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/development/README.md b/development/README.md index a42cbf29..257f2f1a 100644 --- a/development/README.md +++ b/development/README.md @@ -97,6 +97,7 @@ You can create a new site with the following command: ```shell bench new-site sitename --no-mariadb-socket ``` +sitename MUST end with .localhost for trying deployments locally. for example: From 224def513c60a6c380f2c446c44428aa41dde964 Mon Sep 17 00:00:00 2001 From: ahmadRagheb Date: Fri, 4 Dec 2020 07:16:04 +0200 Subject: [PATCH 3/5] Update custom-apps-for-production.md install.sh not found in the folder as the description said its install_app.sh --- docs/custom-apps-for-production.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/custom-apps-for-production.md b/docs/custom-apps-for-production.md index 0f8a988c..d00bd071 100644 --- a/docs/custom-apps-for-production.md +++ b/docs/custom-apps-for-production.md @@ -46,7 +46,7 @@ CMD ["nginx", "-g", "daemon off;"] Copy over the `install_app.sh` file from `./build/erpnext-nginx` ```shell -cp ./build/erpnext-nginx/install.sh ./build/[custom]-nginx +cp ./build/erpnext-nginx/install_app.sh ./build/[custom]-nginx ``` Open up `./installation/docker-compose-custom.yml` and replace all instances of `[app]` with the name of your app. From f5e388ca1137d978991d1f5b2cef90dbf34508fc Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Wed, 30 Dec 2020 22:28:17 +0100 Subject: [PATCH 4/5] docs: single-bench: remove ambigouus remarks on workarounds for non-resolvable site names. This fixes #395. By removing the remarks on how to work around dns resolution problems and confusing distribution specific defaults the documentation for SITE_NAME is clarified to: * require resolvable names * that this is the URL/host to be entered by users into their browsers --- docs/single-bench.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/single-bench.md b/docs/single-bench.md index c2867980..28dc9505 100644 --- a/docs/single-bench.md +++ b/docs/single-bench.md @@ -35,7 +35,7 @@ To get started, copy the existing `env-local` or `env-production` file to `.env` - Bootstraps a MariaDB container with this value set as the root password. If a managed MariaDB instance is used, there is no need to set the password here. - In case of a separately managed database setups, set the value to the database's hostname/IP/domain. - `SITE_NAME=erp.example.com` - - Creates this site after starting all services and installs ERPNext. Site name is domain name that resolves. e.g. `erp.example.com` or `mysite.localhost` + - Creates this site after starting all services and installs ERPNext. Site name must be resolvable by users machines and the ERPnext components. e.g. `erp.example.com` or `mysite.localhost`. - ``SITES=`erp.example.com` `` - List of sites that are part of the deployment "bench" Each site is separated by a comma(,) and quoted in backtick (`). By default site created by ``SITE_NAME`` variable is added here. - If LetsEncrypt is being setup, make sure that the DNS for all the site's domains correctly point to the current instance. @@ -81,8 +81,6 @@ Notes: - After the site is ready the username is `Administrator` and the password is `$ADMIN_PASSWORD` - The local deployment is for testing and REST API development purpose only - A complete development environment is available [here](../development) -- The site names are limited to patterns matching \*.localhost by default -- Additional site name patterns can be added by editing /etc/hosts of your host machine ## Docker containers From 761f8345d7e3d78da62200bb040402c9dd423d0b Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Thu, 31 Dec 2020 15:29:14 +0100 Subject: [PATCH 5/5] Update docs/single-bench.md Co-authored-by: Revant Nandgaonkar --- docs/single-bench.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/single-bench.md b/docs/single-bench.md index 28dc9505..1b5da2c7 100644 --- a/docs/single-bench.md +++ b/docs/single-bench.md @@ -35,7 +35,7 @@ To get started, copy the existing `env-local` or `env-production` file to `.env` - Bootstraps a MariaDB container with this value set as the root password. If a managed MariaDB instance is used, there is no need to set the password here. - In case of a separately managed database setups, set the value to the database's hostname/IP/domain. - `SITE_NAME=erp.example.com` - - Creates this site after starting all services and installs ERPNext. Site name must be resolvable by users machines and the ERPnext components. e.g. `erp.example.com` or `mysite.localhost`. + - Creates this site after starting all services and installs ERPNext. Site name must be resolvable by users machines and the ERPNext components. e.g. `erp.example.com` or `mysite.localhost`. - ``SITES=`erp.example.com` `` - List of sites that are part of the deployment "bench" Each site is separated by a comma(,) and quoted in backtick (`). By default site created by ``SITE_NAME`` variable is added here. - If LetsEncrypt is being setup, make sure that the DNS for all the site's domains correctly point to the current instance.