epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-26 09:05:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #398 from frappe/develop

Browse source 
build latest v13 beta images
This commit is contained in:
Revant Nandgaonkar 2021-01-03 21:44:59 +05:30 committed by GitHub
commit c2ef86d1f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/common/worker/install_app.sh
View file

@ -12,5 +12,5 @@ cd ./apps
[ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" [ "${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} pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/${APP_NAME}

2
build/erpnext-nginx/install_app.sh
View file

@ -15,7 +15,7 @@ install_packages git python2
mkdir -p apps mkdir -p apps
cd apps cd apps
git clone --depth 1 https://github.com/frappe/frappe ${BRANCH} 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 cd /home/frappe/frappe-bench/apps/frappe
yarn yarn

1
development/README.md
View file

@ -97,6 +97,7 @@ You can create a new site with the following command:
```shell ```shell
bench new-site sitename --no-mariadb-socket bench new-site sitename --no-mariadb-socket
``` ```
sitename MUST end with .localhost for trying deployments locally.
for example: for example:

2
docs/custom-apps-for-production.md
View file

@ -46,7 +46,7 @@ CMD ["nginx", "-g", "daemon off;"]
Copy over the `install_app.sh` file from `./build/erpnext-nginx` Copy over the `install_app.sh` file from `./build/erpnext-nginx`
```shell ```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. Open up `./installation/docker-compose-custom.yml` and replace all instances of `[app]` with the name of your app.

4
docs/single-bench.md
View file

@ -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. - 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. - In case of a separately managed database setups, set the value to the database's hostname/IP/domain.
- `SITE_NAME=erp.example.com` - `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` `` - ``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. - 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. - 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` - 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 - The local deployment is for testing and REST API development purpose only
- A complete development environment is available [here](../development) - 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 ## Docker containers