2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2025-01-24 07:38:33 +00:00

85 Commits

Author SHA1 Message Date
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
pzdge23
656386c44b added init option 2017-10-09 08:45:52 +05:30
vishalseshagiri
643dd4b4ce Update Dockerfile 2017-10-06 13:55:55 +05:30
vishalseshagiri
7e9abdc738 Update Dockerfile 2017-10-06 13:53:48 +05:30
vishalseshagiri
247f82ae0b Update README.md
Former-commit-id: b5a5fc661896d1a84f393a2ba0ef31ded3ac46fc
2017-10-02 09:48:51 +05:30
vishalseshagiri
41bc6d6164 Update dbench
Added -s flag to dbench

Former-commit-id: 2b1530e523ed0cc11d8ccd91a226764d344e63d0
2017-10-02 09:48:51 +05:30
Karl G
51ded701ed fixing various issues with dbench
- Added missing shebang
- Fixed malformed multi line variables
- Removed unnecessary su (which is not working in this way anyway)
- Added missing error handling (unsupported options as well as missing argument)
- Simplified the whole script (without the removal of features, hopefully?)

Former-commit-id: 33cc4ff3a0b460b40b88f3ea707032fc50448f8a
2017-10-02 09:48:51 +05:30
vishalseshagiri
d3c3c52a27 Updated Readme
Former-commit-id: 935fbb72cb641d7eb6bef1f92cf43ca5468a58fd
2017-10-02 09:48:51 +05:30
vishalseshagiri
7cf16223ff Update README.md
Former-commit-id: fa8e80fe3ebf43a589ae023609cb6d91e3853eb4
2017-10-02 09:48:51 +05:30
vishalseshagiri
f1d67b2152 Update README.md
Former-commit-id: e9ba15a12a4bb8a1bb670e8f0ef3eaec17a1aa24
2017-10-02 09:48:51 +05:30
vishalseshagiri
d850abd658 Rename LICENSE to LICENSE.md
Former-commit-id: 5c58bd720b94a60c8c9977ad169cdb92289d422b
2017-10-02 09:48:51 +05:30
vishalseshagiri
6413ecfc20 Delete LICENSE.md
Former-commit-id: 62678031d6544fa99cf2474604324083da2e38f8
2017-10-02 09:48:51 +05:30
vishalseshagiri
cc21ccfe2e Create LICENSE
Former-commit-id: 9bd9087d16e1ae7b403b91bf352754e34f994fa9
2017-10-02 09:48:51 +05:30
vishalseshagiri
f385cde5d9 Update README.md
Former-commit-id: 7fd94ca8bcde46bdefdeddc48b407705c85b610b
2017-10-02 09:48:51 +05:30
vishalseshagiri
ac115c2ff7 added file-watcher-port and socketio-port + Readme changes
Former-commit-id: 34f60750dc8e1ccd14db4e73504fe4b39f1c70fc
2017-10-02 09:48:51 +05:30
vishalseshagiri
30bfe369ec updated README.md
Former-commit-id: 2a3a449863a34efee0393ce336f15f6c28c9ec8b
2017-10-02 09:48:51 +05:30
vishalseshagiri
662aa6562f global r
Former-commit-id: 1f2e8eb0e84705e4a8150d07ae32e05ae1654d11
2017-10-02 09:48:51 +05:30
vishalseshagiri
94ecd0f69e changes to test and travis.yml
Former-commit-id: 39828590e7dde8efe232cdb917ee17ef319e9f92
2017-10-02 09:48:51 +05:30
vishalseshagiri
67477a1adc converted pip and python to pip3 and python3
Former-commit-id: 81cdd24cb62a208f915af85af2ead82a4cbdc5b9
2017-10-02 09:48:51 +05:30
vishalseshagiri
e308b8717f removed pip install time from .travis.yml
Former-commit-id: 5cb5b9215451934dd32762c0702b221591cd2cf3
2017-10-02 09:48:51 +05:30
vishalseshagiri
58244ae233 Removed docker-exec from travis and shifted to test.py
Former-commit-id: 236ff05ca502fd95ed4705fe6988834fc11b6579
2017-10-02 09:48:51 +05:30
vishalseshagiri
5f6e0fc104 amended commit
Former-commit-id: fa2b54c67c79b910a97768c959f13d77b7fa3dc6
2017-10-02 09:48:51 +05:30
vishalseshagiri
dc5add7526 mend
Former-commit-id: e5ee9da08c607c19abec687cda92a7fe39bd9bcb
2017-10-02 09:48:51 +05:30
vishalseshagiri
2e38d7d921 mend
Former-commit-id: 12685970e864e8b73229602ffe3f796d8171fd56
2017-10-02 09:48:51 +05:30
vishalseshagiri
01a56f6a77 mend
Former-commit-id: 3d081fb05473579f52f4f1e57e07533a6d7b7835
2017-10-02 09:48:51 +05:30
vishalseshagiri
372940696e mend
Former-commit-id: 6eebe2c38a24a9dd5a3ada5a3edcce0bdba12c8f
2017-10-02 09:48:51 +05:30
vishalseshagiri
6b71c86090 Fixed the permissions issue in travis.yml
Former-commit-id: 8d380f2e4aa04197dc2f3e6f3aabbed8d1c02f18
2017-10-02 09:48:51 +05:30
vishalseshagiri
875d88adcd shifted docker-exec from script to install in travis.yml
Former-commit-id: d3fce5cec08014769bff370a58d749d2a028f547
2017-10-02 09:48:51 +05:30
vishalseshagiri
fbf13bbc2e Added bench init , start and python tests to curl the site
Former-commit-id: 3f148638fb596fc922bd24e045eb1a568443ffaf
2017-10-02 09:48:47 +05:30
vishalseshagiri
9d1d09a3c0 changed mariadb ports to 3307
Former-commit-id: 06ff744f7b7100a46417a06884ae4aa9a6ef7ca5
2017-10-02 09:45:46 +05:30
vishalseshagiri
d73059b753 Added pkill mysqld
Former-commit-id: 50d223eb6d5523278d136ca0410730100745ad0b
2017-10-02 09:45:46 +05:30
vishalseshagiri
ebbcb24141 Update README.md
Former-commit-id: 9dbd140a7243e9a4f02db4ef15f6db5fd6a02222
2017-10-02 09:45:46 +05:30
vishalseshagiri
d1beca6939 Added env: - DOCKER_COMPOSE_VERSION: 1.8.0
Former-commit-id: 36eb7ba832e34f24723e202a9ff558687549df11
2017-10-02 09:45:46 +05:30
vishalseshagiri
d8fa93fd3f travis errors rectified
Former-commit-id: 6c605852e4c5422eafb98c628cd1ad086f3b362b
2017-10-02 09:45:46 +05:30
vishalseshagiri
950647a182 git diff bb01cc827732524ef9a2aa94036f0f8d9d6e78e2 a32c9230dd726399c59f5849d7e0a25b1e3a281a | git apply --reject --whitespace=fix 2017-10-02 09:32:03 +05:30
vishalseshagiri
bb01cc8277 Merge pull request #8 from vishalseshagiri/development
Merge pull request #7 from vishalseshagiri/master

Former-commit-id: f04cddcd63a40abce637c3bda4fce27a708bf7d5
2017-07-25 09:33:41 +05:30
vishalseshagiri
23a2b51a5f Update README.md
Former-commit-id: f4eb01f58de3ebdebe5b72507ee808a4ccd37aa4
2017-07-25 09:32:59 +05:30
vishalseshagiri
757e20272e Update README.md
Former-commit-id: c6df5de79fab359b23d67966771131eb25d42aab
2017-07-25 09:31:01 +05:30
vishalseshagiri
c78cb53952 Update README.md
Former-commit-id: 9569cbe81907e458087f95331d81d7364d62ca95
2017-07-25 09:28:49 +05:30
vishalseshagiri
8f40ff5003 Rename enter-docker.sh to docker-enter.sh
Former-commit-id: 5f40e896c3b32c0a375ea55c5ed50044b6f6796c
2017-07-25 09:27:27 +05:30
vishalseshagiri
260ef491de Update README.md
Former-commit-id: 8ec1b109816baace61b9b7df6ff52dbba3411531
2017-07-24 18:35:01 +05:30
vishalseshagiri
cc105c5959 Update README.md
Former-commit-id: ae171c863475b46b5ff2ecd3d46a21fe8deb149f
2017-07-24 18:18:09 +05:30
vishalseshagiri
128dfb61b0 Merge pull request #7 from vishalseshagiri/master
merge from master

Former-commit-id: 7c2162ee5c63a7b32c812eb9189f24a78bd17db6
2017-07-24 18:00:50 +05:30
vishalseshagiri
1833db34f1 Merge pull request #6 from vishalseshagiri/development
Merge pull request #5 from vishalseshagiri/master

Former-commit-id: 92589442355e061414fef5e7bf502231003e6e90
2017-07-24 18:00:15 +05:30
vishalseshagiri
17671a2fb4 Update README.md
Former-commit-id: 5e3883b46b0680580ddfe9b67c07a3eb70c44fba
2017-07-24 17:59:38 +05:30
vishalseshagiri
70b80f9018 Merge pull request #5 from vishalseshagiri/master
merge with master

Former-commit-id: 4fd5633745a28fda391717dcde838e6c74c7e5f9
2017-07-24 17:57:58 +05:30
vishalseshagiri
56a203d37c Update README.md
Former-commit-id: 70f54a9b666294ee50f7c17f5a90b9523f0d2304
2017-07-24 17:55:58 +05:30