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

162 Commits

Author SHA1 Message Date
Revant Nandgaonkar
97ec097870
Merge pull request #90 from Thunderbottom/remove-deprecated
chore: cleanup redundant files
2020-03-02 23:12:20 +05:30
Chinmay D. Pai
13df6d6b9e
chore: remove dbench test
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-02 23:10:19 +05:30
Chinmay D. Pai
b9a6c42333
chore: cleanup redundant files
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-02 23:10:16 +05:30
Chinmay Pai
749bf1ee2b
Merge pull request #91 from revant/fix-build-push-tags
fix: erpnext-assets v12 build
2020-03-02 23:08:36 +05:30
Revant Nandgaonkar
f09a20a999 ci: push branch tags 2020-03-02 22:59:10 +05:30
Revant Nandgaonkar
66343400ff fix: erpnext-assets v12 build 2020-03-02 22:58:52 +05:30
Chinmay Pai
22a9e30451
Merge pull request #89 from revant/fix-docker-login
ci: fix travis build docker login condition
2020-03-02 21:46:17 +05:30
Revant Nandgaonkar
eff40a1b4b ci: fix travis build docker login condition 2020-03-02 21:36:07 +05:30
Chinmay Pai
6a8eb99331
Merge pull request #84 from revant/master
feat: docker production images
2020-03-02 21:17:14 +05:30
Revant Nandgaonkar
07bcaec723 fix: allow user process to create logs
allow user process to create logs in worker images
2020-03-02 16:01:35 +05:30
Revant Nandgaonkar
9adaee274f ci: tag git branches as docker images 2020-03-02 14:58:16 +05:30
Chinmay D. Pai
b2f1bdcc27
chore: clean up and update readme
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-02 10:59:25 +05:30
Revant Nandgaonkar
0df0d6d11f fix: use SOCKETIO_PORT instead of FRAPPE_SOCKETIO_PORT 2020-03-02 05:09:57 +05:30
Revant Nandgaonkar
c2c09400da fix: use commonly known variable for MYSQL_ROOT_PASSWORD 2020-03-02 05:08:49 +05:30
Revant Nandgaonkar
4364330fe9 fix: improve installation README 2020-03-02 05:07:40 +05:30
Revant Nandgaonkar
2f59ebbae0 fix: installation README for migration 2020-03-01 17:17:01 +05:30
Revant Nandgaonkar
8d9d583a8f fix: production installation README 2020-03-01 16:45:54 +05:30
Revant Nandgaonkar
33b5071aaa fix: Frappe/ERPNext worker image new site command 2020-03-01 16:45:34 +05:30
Revant Nandgaonkar
500b8925cb chore: README for installation 2020-03-01 15:39:26 +05:30
Revant Nandgaonkar
e32d3b4e51 fix: ERPNext assets image build 2020-03-01 15:38:05 +05:30
Revant Nandgaonkar
f48e1ce4a6 fix: docker-compose-erpnext 2020-02-24 12:57:20 +05:30
Revant Nandgaonkar
1a6aa403ee ci: fix travis bash script 2020-02-21 17:48:20 +05:30
Revant Nandgaonkar
e16f41b947 ci: fix travis bash conditions 2020-02-21 17:44:40 +05:30
Revant Nandgaonkar
5bd812ccdd ci: docker login only before building images 2020-02-21 17:35:26 +05:30
Revant Nandgaonkar
1cc7c7050f ci: build images not to run on PR 2020-02-21 16:55:13 +05:30
Revant Nandgaonkar
5d1dd3c0c4 ci: branch based builds 2020-02-21 13:09:10 +05:30
Revant Nandgaonkar
c5d31ef164 ci: fix frappe-worker docker image name 2020-02-20 23:44:25 +05:30
Revant Nandgaonkar
ee43d7d6ef ci: fix docker image name 2020-02-20 23:28:18 +05:30
Revant Nandgaonkar
ab4cb7936c ci: build images for edge, v12 and v11 2020-02-20 23:07:18 +05:30
Revant Nandgaonkar
da53bff5df feat: docker-compose services
common services redis and mariadb
frappe services gunicorn, schedule, workers, socketio
erpnext services gunicorm, schedule, workers, socketio
2020-02-20 22:35:49 +05:30
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