2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-11-08 14:21:05 +00:00
Commit Graph

132 Commits

Author SHA1 Message Date
Revant Nandgaonkar
9b6a641f4d fix: config generation
fix envsubst single quote SHELL-FORMAT
env var changed from ERPNEXT_PY to FRAPPE_PY
2020-02-20 21:48:51 +05:30
Revant Nandgaonkar
242708df0c refactor: reuse common scripts and files
move common scripts to build/common
2020-02-20 18:01:23 +05:30
Chinmay D. Pai
347b94dee2
chore: fixes to shell scripts
* envsubst: expression may fail to expand in single quotes
* use (()) instead of let
* use find instead of ls to better hand alphanumeric folders

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-02-20 12:33:52 +05:30
Chinmay D. Pai
3b5f829248
chore: remove unused update.py
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-02-20 12:09:51 +05:30
Chinmay D. Pai
0910278efd
feat: add support to start bench console
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-02-20 12:08:51 +05:30
Chinmay D. Pai
6677885e78
chore: reorder commands for clarity
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-02-20 11:44:51 +05:30
Revant Nandgaonkar
e1e1c6b6f9 refactor: rename images
erpnext-assets - ERPNext nginx config + static assets
erpnext-worker - ERPNext python environment
frappe-assets - Frappe nginx config + static assets
frappe-worker - Frappe python environment
frappe-socketio - Frappe socketio process common for apps
2020-02-17 20:35:54 +05:30
Revant Nandgaonkar
aeadd23214 feat: docker production images 2020-02-10 15:59:11 +05:30
Suraj Shetty
305ef606ce
fix(Readme): Typo (#81)
fix(Readme): Typo
2020-01-23 13:35:52 +05:30
Suraj Shetty
7ddcae41c5
fix(Readme): Typo 2020-01-23 13:21:47 +05:30
MorezMartin
18b46e8a01 chore: install wkhtmltox correctly (#72)
* Install wkhtmltox correctly

* code cleaning

* wkhtmltox working with 0.12.5
2019-11-03 11:42:36 +05:30
chabad360
acee24b577 refactor: dockerfile
* testing replacement for dbench

* fixed perm issue and added docker control

* fixes and tests

fixed travis test, and perm issue

* auto add permissions

* bench setup anything-else should work now

* removed adding site names to host (its pointless)

* moved redis configuration folder into conf/

* added a docker down feature to dbench and changed some of the docs

* hopefully should fix the args issue

* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* Removed extra line

* Removed MAINTAINER in favor of LABEL

* all installs are in one apt command

* Switch bench to dbench, added -s feature of dbench to bench. updated
Docker file with sudo and vim, and setup travis to run with said changes

* dockerfile: clean up (#52)

* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* fixed travis, and cleaned up dbench a little

* Oops...

* oops, but only for travis, this runs fine

* Travis!

* added help to dbench, and updated readme

* changes some of the wording of the help message

* dbench: fix init issues (#55)

./dbench init would lead to 'missing argument: PATH' issue (#54), and could not find Procfile_docker and site-config.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* bench setup anything-else should work now

* Clean cache to get a smaller image (#57)

Please include this commit to decrease the size of the docker image, the "rm -rf /var/lib/apt/lists/*" it is not usefull if it is not used in the same stage of the apt-get install RUN, similar with pip cache.

References:
 - https://linux.die.net/man/8/apt-get
 - https://stackoverflow.com/questions/9510474/removing-pips-cache
 - https://semaphoreci.com/blog/2016/12/13/lightweight-docker-images-in-5-steps.html

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file;

(b) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

Signed-off-by: William Moreno Reyes <williamjmorenor@gmail.com>

* removed adding site names to host (its pointless)

* moved redis configuration folder into conf/

* added a docker down feature to dbench and changed some of the docs

* Changed the readme significantly

 Please enter the commit message for your changes. Lines starting

* changed test.py to avoid naming errors

* moving some things around for less lines

* some more slight name changes

* added a .gitignore

* added the frappe folder again

* added a .dockerignore and fixed the dockerfile up a bit

* Updating travis' docker and compose

 This is the commit message #3:

* bringing chown in dbench back

* some refractoring

* implementing codacy sugestions

* moving some things around

* Updating dbench in some areas

* some random changes and fixes

* dockerfile refactoring

* Refractoring, reducing layers

* removing the py script that took too many lines to do one simple thing

* Fixed up the readme

* some refractoring

* moving to debian slim and refractoring

* adding some logging

* Updated travis to ubuntu xenial, should fix the curl issue

* manually building curl, cause we cant use  the latest version...

* maybe we dont need it

* changing the url to curl

* trying this instead

* lets just let it pollute the stream

* please pollute!

* some last bits of refractoring

* some refractoring

* fixed a few issues and did some refractoring

* needed an excuse to get travis to build

* adding in some changes learnt from seibert-media/erpnext-docker

* that should fix that

* where did that "h" come from?

* fix that...

* maybe that

* please work...

* try that for locales

* dont know what that's doing there

* so it didn't work...

* lets try doing locales like this

* forgot the -y...

* trying it this way

* and if we dont remove it?

* what about like this?

* small change

* small change

* I wonder...

* some small refractoring

* saving some time

* bring that back

* fix the smallie
2019-11-02 11:17:38 +05:30
Matteo D
4e7dd47d0e Fixed some typos (#65) 2019-06-17 00:12:32 +05:30
chabad360
33ad0c4fe9 refactor(frappe-docker): code cleanup and fixes (#63)
* testing replacement for dbench

* fixed perm issue and added docker control

* fixes and tests

fixed travis test, and perm issue

* auto add permissions

* bench setup anything-else should work now

* removed adding site names to host (its pointless)

* moved redis configuration folder into conf/

* added a docker down feature to dbench and changed some of the docs

* hopefully should fix the args issue

* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* Removed extra line

* Removed MAINTAINER in favor of LABEL

* all installs are in one apt command

* Switch bench to dbench, added -s feature of dbench to bench. updated
Docker file with sudo and vim, and setup travis to run with said changes

* dockerfile: clean up (#52)

* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* fixed travis, and cleaned up dbench a little

* Oops...

* oops, but only for travis, this runs fine

* Travis!

* added help to dbench, and updated readme

* changes some of the wording of the help message

* dbench: fix init issues (#55)

./dbench init would lead to 'missing argument: PATH' issue (#54), and could not find Procfile_docker and site-config.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* bench setup anything-else should work now

* Clean cache to get a smaller image (#57)

Please include this commit to decrease the size of the docker image, the "rm -rf /var/lib/apt/lists/*" it is not usefull if it is not used in the same stage of the apt-get install RUN, similar with pip cache.

References:
 - https://linux.die.net/man/8/apt-get
 - https://stackoverflow.com/questions/9510474/removing-pips-cache
 - https://semaphoreci.com/blog/2016/12/13/lightweight-docker-images-in-5-steps.html

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file;

(b) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

Signed-off-by: William Moreno Reyes <williamjmorenor@gmail.com>

* removed adding site names to host (its pointless)

* moved redis configuration folder into conf/

* added a docker down feature to dbench and changed some of the docs

* Changed the readme significantly

 Please enter the commit message for your changes. Lines starting

* changed test.py to avoid naming errors

* moving some things around for less lines

* some more slight name changes

* added a .gitignore

* added the frappe folder again

* added a .dockerignore and fixed the dockerfile up a bit

* Updating travis' docker and compose

 This is the commit message #3:

* bringing chown in dbench back

* some refractoring

* implementing codacy sugestions

* moving some things around

* Updating dbench in some areas

* some random changes and fixes

* dockerfile refactoring

* Refractoring, reducing layers

* removing the py script that took too many lines to do one simple thing

* Fixed up the readme

* some refractoring

* moving to debian slim and refractoring

* adding some logging

* Updated travis to ubuntu xenial, should fix the curl issue

* manually building curl, cause we cant use  the latest version...

* maybe we dont need it

* changing the url to curl

* trying this instead

* lets just let it pollute the stream

* please pollute!
2019-04-06 01:20:30 +05:30
William Moreno
687ef7cecc Clean cache to get a smaller image (#57)
Please include this commit to decrease the size of the docker image, the "rm -rf /var/lib/apt/lists/*" it is not usefull if it is not used in the same stage of the apt-get install RUN, similar with pip cache.

References:
 - https://linux.die.net/man/8/apt-get
 - https://stackoverflow.com/questions/9510474/removing-pips-cache
 - https://semaphoreci.com/blog/2016/12/13/lightweight-docker-images-in-5-steps.html

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file;

(b) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

Signed-off-by: William Moreno Reyes <williamjmorenor@gmail.com>
2018-10-22 07:11:59 +00:00
chabad360
86d138e8e3 bench setup anything-else should work now (#56) 2018-10-20 04:54:21 +00:00
Chinmay Pai
6fc3bfbdcf
dbench: fix init issues (#55)
./dbench init would lead to 'missing argument: PATH' issue (#54), and could not find Procfile_docker and site-config.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-10-13 17:20:04 +00:00
chabad360
2b1334d5a5 improvements to travis and dbench (#53)
This PR adds the `bench` script, which aims for near parity with frappe bench, it makes setting up far easier, because instead of running `./dbench -c "new-site site1.local"` you only white what you would if bench was installed on the local system (i.e. `./bench new-site site1.local`), it also adds other features as well.
2018-10-13 03:05:29 +00:00
chabad360
e079c479f5 dockerfile: clean up (#52)
* Condensed Dockerfile

Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.

* Removed extra line

* Removed MAINTAINER in favor of LABEL

* all installs are in one apt command
2018-10-05 18:50:10 +00:00
Chinmay Pai
e382d27765
Merge pull request #51 from chabad360/master
Modify volume naming and add database persistince
2018-10-04 10:56:55 +00:00
chabad360
e727e3dc13
Merge pull request #1 from chabad360/develop
Modify volume naming and add database persistince
2018-10-03 18:15:46 -07:00
chabad360
1f8685dce1
Fixed bad volume naming 2018-10-03 17:10:27 -07:00
chabad360
835e5d60b6
Update docker-compose.yml
Added persistence to mariadb, and cleaned it up a bit
2018-10-03 17:05:37 -07:00
chabad360
70a45b2f5d
Update docker-compose.yml 2018-10-03 16:20:05 -07:00
Chinmay Pai
62c15cc2ac
Merge pull request #49 from Thunderbottom/fix-docker
redis: revert mistakes
2018-09-28 14:53:24 +05:30
Chinmay Pai
f96ffe5d70
redis: revert mistakes
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-28 14:45:30 +05:30
Chinmay Pai
88a9e3398c
Merge pull request #48 from Thunderbottom/fix-docker
redis: fix redis
2018-09-28 13:35:10 +05:30
Chinmay Pai
18e09eb3e0
Merge pull request #47 from Thunderbottom/master
travis: replace unexisting command option
2018-09-28 13:34:24 +05:30
Chinmay Pai
732dc1c035
Merge pull request #41 from yeisonvargasf/master
Removed innodb configs because cause error with MariaDB 10.3
2018-09-28 13:34:12 +05:30
Chinmay Pai
62f1129b3f
redis: fix redis
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-28 13:33:14 +05:30
Chinmay Pai
4c3c7fc45c
travis: replace unexisting command option
`--skip-bench-mkdir` does not exist, and it breaks travis

we replace it with `--ignore-exists`

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-27 13:19:47 +05:30
Yeison Vargas
00602940cd Removed innodb configs because cause error with MariaDB 10.3 2018-07-08 18:43:42 -05:00
Ameya Shenoy
6e8bb9a142
Merge pull request #37 from reilly3000/patch-1
Updated README.md to clarify initial admin password
2018-05-04 23:40:21 +05:30
reilly3000
720b76f4d2
Updated README.md to clarify initial admin password
it took me a long time to way to login after initially installing. I eventually found out the default by looking into closed issues on github. I just added a line to the readme to make it clear for future users to get up and running faster.
2018-05-04 10:54:30 -07:00
Ameya Shenoy
ac3551d6ed
Merge pull request #32 from joezsweet/clone-bench-master
Make work on latest
2018-02-28 15:22:10 +05:30
joezsweet
3f7314d5aa
change to --ignore-exist 2018-02-27 10:47:40 +01:00
joezsweet
61d2ae1e9b
Make work on latest
- clone bench master
- install yarn globally
- set lang as C.UTF-8
2018-02-27 10:44:14 +01:00
vishalseshagiri
c2e45caba3
Merge pull request #22 from frappe/develop
Updated README.md
2017-11-27 14:10:50 +05:30
vishalseshagiri
e2415aa832
Updated README.md
- added dbench init to the README
- moved usage commands to wiki
2017-11-27 14:09:12 +05:30
vishalseshagiri
cc6c7de550
Merge pull request #21 from frappe/develop
Updated Dockerfile
2017-11-27 13:04:00 +05:30
vishalseshagiri
9efa4001c4
Updated Dockerfile
- changed maintainer to frappé
2017-11-27 13:03:33 +05:30
vishalseshagiri
b1c218e0b1
Merge pull request #20 from frappe/develop
merge develop into master
2017-11-27 12:46:04 +05:30
vishalseshagiri
6bf6927deb
Updated dbench
- changed default site on bench init from bench-manager.local to site1.local
- dbench init by default installs erpnext now
2017-11-27 12:44:49 +05:30
vishalseshagiri
1a24453af8 Merge pull request #18 from africlouds/hotfixes
Fixed mariadb ports mapping
2017-10-26 09:44:03 +05:30
vishalseshagiri
a6da129cbd Update README.md 2017-10-09 09:44:06 +05:30
vishalseshagiri
bbb1759fd9 Merge pull request #16 from frappe/develop
Develop
2017-10-09 09:43:32 +05:30
vishalseshagiri
641c4a08ac changed travis badge 2017-10-09 09:38:54 +05:30
vishalseshagiri
c3c639dd35 Merge pull request #15 from vishalseshagiri/develop
dbench init added + travis errors fixed
2017-10-09 09:38:06 +05:30
vishalseshagiri
f4a52d8746 Update README.md 2017-10-09 09:35:51 +05:30
pzdge23
89654cf580 fixing travis build error 2017-10-09 09:23:42 +05:30