accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-11-08 14:21:05 +00:00
Code Issues Releases Activity

some small changes

Browse Source
This commit is contained in:
chabad360 2020-03-06 06:23:53 +00:00
parent 1c513f9e41
commit 7bdd329793
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -258,11 +258,11 @@ docker exec -it \
To add your own apps to the image, we'll need to create a custom image with the help of a special wrapper script To add your own apps to the image, we'll need to create a custom image with the help of a special wrapper script
1. Create two folders called `[custom]-worker` and `[custom]-assets` in the `build` folder. 1. Create two folders called `[custom]-worker` and `[custom]-nginx` in the `build` folder.
```bash ```bash
cd frappe_docker cd frappe_docker
mkdir ./build/[custom]-worker ./build/[custom]-assets mkdir ./build/[custom]-worker ./build/[custom]-nginx
``` ```
2. Create a `Dockerfile` in `./build/[custom]-worker` with the following content: 2. Create a `Dockerfile` in `./build/[custom]-worker` with the following content:
@ -274,20 +274,20 @@ To add your own apps to the image, we'll need to create a custom image with the
# Only add the branch if you are using a specific tag or branch. # Only add the branch if you are using a specific tag or branch.
``` ```
3. Create a `Dockerfile` in `./build/[custom]-assets` with the following content: 3. Create a `Dockerfile` in `./build/[custom]-nginx` with the following content:
```Dockerfile ```Dockerfile
FROM bitnami/node:12-prod FROM bitnami/node:12-prod
COPY build/[custom]-assets/install_app.sh /install_app COPY build/[custom]-nginx/install_app.sh /install_app
RUN /install_app [custom] https://github.com/[username]/[custom] RUN /install_app [custom] https://github.com/[username]/[custom]
FROM frappe/erpnext-assets:edge FROM frappe/erpnext-nginx:edge
COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/
COPY --from=0 /rsync /rsync COPY --from=0 /rsync /rsync
RUN echo -n "\nerpnext" >> /var/www/html/apps.txt RUN echo -n "\n[custom]" >> /var/www/html/apps.txt
VOLUME [ "/assets" ] VOLUME [ "/assets" ]
@ -295,10 +295,10 @@ To add your own apps to the image, we'll need to create a custom image with the
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]
``` ```
4. Copy over the `install_app.sh` file from `./build/erpnext-assets` 4. Copy over the `install_app.sh` file from `./build/erpnext-nginx`
```bash ```bash
cp ./build/erpnext-assets/install.sh ./build/[custom]-assets cp ./build/erpnext-nginx/install.sh ./build/[custom]-nginx
``` ```
5. Open up `./installation/docker-compose-custom.yml` and replace all instances of `[app]` with the name of your app. 5. Open up `./installation/docker-compose-custom.yml` and replace all instances of `[app]` with the name of your app.

2
build/erpnext-nginx/Dockerfile
View File

@ -4,7 +4,7 @@ COPY build/erpnext-nginx/install_app.sh /install_app
RUN /install_app erpnext https://github.com/frappe/erpnext RUN /install_app erpnext https://github.com/frappe/erpnext
FROM frappe/frappe-assets:develop FROM frappe/frappe-nginx:develop
COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/
COPY --from=0 /rsync /rsync COPY --from=0 /rsync /rsync