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

36 Commits

Author SHA1 Message Date
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
Revant Nandgaonkar
f09a20a999 ci: push branch tags 2020-03-02 22:59:10 +05:30
Revant Nandgaonkar
eff40a1b4b ci: fix travis build docker login condition 2020-03-02 21:36:07 +05:30
Revant Nandgaonkar
9adaee274f ci: tag git branches as docker images 2020-03-02 14:58:16 +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
242708df0c refactor: reuse common scripts and files
move common scripts to build/common
2020-02-20 18:01:23 +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
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
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
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
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
pzdge23
89654cf580 fixing travis build error 2017-10-09 09:23:42 +05:30
vishalseshagiri
94ecd0f69e changes to test and travis.yml
Former-commit-id: 39828590e7
2017-10-02 09:48:51 +05:30
vishalseshagiri
67477a1adc converted pip and python to pip3 and python3
Former-commit-id: 81cdd24cb6
2017-10-02 09:48:51 +05:30
vishalseshagiri
e308b8717f removed pip install time from .travis.yml
Former-commit-id: 5cb5b92154
2017-10-02 09:48:51 +05:30
vishalseshagiri
58244ae233 Removed docker-exec from travis and shifted to test.py
Former-commit-id: 236ff05ca5
2017-10-02 09:48:51 +05:30
vishalseshagiri
5f6e0fc104 amended commit
Former-commit-id: fa2b54c67c
2017-10-02 09:48:51 +05:30
vishalseshagiri
dc5add7526 mend
Former-commit-id: e5ee9da08c
2017-10-02 09:48:51 +05:30
vishalseshagiri
2e38d7d921 mend
Former-commit-id: 12685970e8
2017-10-02 09:48:51 +05:30
vishalseshagiri
01a56f6a77 mend
Former-commit-id: 3d081fb054
2017-10-02 09:48:51 +05:30
vishalseshagiri
372940696e mend
Former-commit-id: 6eebe2c38a
2017-10-02 09:48:51 +05:30
vishalseshagiri
6b71c86090 Fixed the permissions issue in travis.yml
Former-commit-id: 8d380f2e4a
2017-10-02 09:48:51 +05:30
vishalseshagiri
875d88adcd shifted docker-exec from script to install in travis.yml
Former-commit-id: d3fce5cec0
2017-10-02 09:48:51 +05:30
vishalseshagiri
fbf13bbc2e Added bench init , start and python tests to curl the site
Former-commit-id: 3f148638fb
2017-10-02 09:48:47 +05:30
vishalseshagiri
d73059b753 Added pkill mysqld
Former-commit-id: 50d223eb6d
2017-10-02 09:45:46 +05:30
vishalseshagiri
d1beca6939 Added env: - DOCKER_COMPOSE_VERSION: 1.8.0
Former-commit-id: 36eb7ba832
2017-10-02 09:45:46 +05:30
vishalseshagiri
d8fa93fd3f travis errors rectified
Former-commit-id: 6c605852e4
2017-10-02 09:45:46 +05:30
vishalseshagiri
950647a182 git diff bb01cc8277 a32c9230dd726399c59f5849d7e0a25b1e3a281a | git apply --reject --whitespace=fix 2017-10-02 09:32:03 +05:30