mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-23 00:05:09 +00:00
Squashed commit of the following:
commit daf26de4ed5f63e63f6561612f7a5b7eabd02491 Merge:441f091d292881 Author: chabad360 <chabad360@gmail.com> Date: Mon Dec 23 04:03:18 2019 +0000 Merge branch 'entrypoint' into develop commit d292881df19942994adcf1ff86571a2cbff27658 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Jul 5 13:46:34 2019 -0400 Mostly refractoring commit 7640f1535e7fcc9e2cea510e14b96f273c0ef9ad Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Jul 3 13:45:37 2019 -0400 how did those dissapear? commit afcb535e55f726962ca64b18dbbb9141fe6a1b5e Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Jul 2 11:06:21 2019 -0400 Some small refractoring commit ceed87b535eedf9f634e838b78b33a114f5ab453 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Jul 2 07:55:40 2019 -0400 killed a few birds with one stone commit 1bb203c86a249af0c9540c350c6a1b157697edf3 Merge: fc086891f39396Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Jul 2 07:52:56 2019 -0400 merge in fixes from locale_fixing commit fc086894461d2eeb0932a03e153f30c53875515d Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Jun 26 22:44:41 2019 -0400 why is the there commit 552d5eb9889b9c736cf60e6923801ee626e4ea20 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Jun 25 16:49:39 2019 -0400 some changes to the testing process commit 2b79e392c255dd4f25cfaad56dc0a399c160b2f5 Merge: de9b0c6 f21e911 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Jun 25 14:46:37 2019 -0400 Merge changes from entrypoint_supervisor + a fix commit f21e9110d44baa0b702816b9cdc129dc94405fed Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jun 24 22:59:40 2019 -0400 thata should be right commit 3437399999c85c6394e0497524be948c87178ff8 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jun 24 22:49:15 2019 -0400 oops, i hope this actually works tho... commit 8b692797c42d8e07bc86ab302ab2487f2055a641 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jun 24 22:31:11 2019 -0400 That should solve those issues commit 930fc009899a3c4a5160dc0e2f6738815a5f4164 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jun 24 20:36:31 2019 -0400 some random fixes (some might actualy be helpfull) commit 17bc7ebd44ef2db09c217d74f40143e56e679084 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jun 24 19:41:44 2019 -0400 trying some new defaults here commit de9b0c6c0c86971f945c86fa59c72fa6e5c94da4 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Apr 16 22:21:47 2019 -0700 this also means we dont need 9 min commit 3c3833cb9a38efb22a9f80422e78ca71198f78d4 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Apr 16 22:12:20 2019 -0700 Fixed an breaking issue where our templates were not applied commit f4202bef191c2cfea060600e77a2ddbca59d6e36 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Apr 16 19:16:05 2019 -0700 looks like 8 min isn't enough now commit 5f75265dcf3a9ed13c96e7736dd6e98099f8741d Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Apr 16 16:21:09 2019 -0700 a bit more refractoring commit cb2a27e834a5f8611941a5bf4843d81b8a68c6d8 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Apr 16 16:20:20 2019 -0700 refractored the tar lines commit ee36b2ac5c569bcd88c2e5aead754fc2df47eccc Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Apr 14 20:24:37 2019 -0700 safely adding bench files commit d59be8d4f86a1fcd9685af2c01c01b530e02e679 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Apr 10 02:12:11 2019 -0400 locales were missing... commit 2489f0128352b1e9c6a0ecf55cccb71fed5ec81e Merge: e171c93 516e960 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Apr 10 02:10:15 2019 -0400 Merge in changes from main entrypoint branch commit 516e96054c4d0565d29fae02f9b1d97bcadae0a4 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Apr 10 01:53:56 2019 -0400 another one! commit 8f189d6e926354ff762d8afed7f4e331a66346e1 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Apr 10 01:48:54 2019 -0400 oops, small typo commit ee493499e8df51f1c5b3c2a077f33b121ece3c60 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Apr 10 01:44:31 2019 -0400 refactoring a bit (and trying somthing new too) commit 3a4b56347abcf8589157777b88b5d385ddb2420f Merge: 0ae7d1c4c7be00Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Apr 10 01:38:18 2019 -0400 Merge in develop commit e171c93dadd3a7557d576a91b1c3b445aae65a10 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Apr 10 01:36:43 2019 -0400 refractoring a bit commit 76df5060a84701ef94f4d61a246f699f9d32c0f0 Merge: 30a37d74c7be00Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Apr 10 01:30:43 2019 -0400 merge in develop commit 0ae7d1cff7ab044c828488e7152de80fb222b694 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Apr 9 02:32:20 2019 -0400 Fixed some issues commit 30a37d74e7b540a73bbba0f07ce9a76c049595a6 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Apr 7 23:15:22 2019 -0400 Adding nginx to supervisor (Genius! thanks @seibert-media for that) commit 99e16ec8b1c89d6a24642d28f41278757db02af3 Merge: c239965 913fb74 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Mar 22 17:45:36 2019 -0400 There, merged! commit 913fb74bd35a4ecfe5d9dd57581455f03c2fd308 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Mar 22 17:43:47 2019 -0400 fixed a small typo which made the wole thing fail commit 3e702bd5bab2715f0e32dc05505adb0de5ee3893 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Mar 22 00:43:14 2019 -0400 this should save some room commit c23996568fe8a528712831c8e8f29dfbb470c3e1 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Mar 22 00:30:32 2019 -0400 Saving some room in stdout commit db4e99ba5e591b606901170f15c83942d2397759 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 17:04:56 2019 -0400 oops commit 39221de32571128f1121926be4a51ec816e9699e Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 16:12:14 2019 -0400 docker stop kills sould work now commit b2fedfc02d6df44877cacaa095959bcb5de2e8c0 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 16:00:48 2019 -0400 added a better kill switch commit baf710d067a2cd42ed0ce34b8f5a40034201ee79 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 15:37:25 2019 -0400 nginx now listiens on anything commit d96b35947f95460860c88b84c46215bc8d658f22 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 10:56:57 2019 -0400 making nginx wait a bit commit f6ec785ba45e7beb912f7e38f31d8f87efd26268 Merge: 725ef81 5a3bde5 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 10:56:36 2019 -0400 merge in some changes commit 5a3bde5af9c1f3b45abf3dcc3b5e0bd09008164e Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 10:53:19 2019 -0400 fixed another small echo bug commit 589643fbfb467a4266b4c93efac334851ab883b4 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 10:28:43 2019 -0400 fixed the config printing commit 665226e485010514ddc3c57e6ebd39ef78f4a603 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 01:48:14 2019 -0400 playing with the logging a bit commit 725ef81d1588e7e3280e36a7031361f239ac11f8 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 01:22:22 2019 -0400 plus a change to the health check! commit b9415b4b1054ea326b24be7aee58e11edc9a4fba Merge: e5b6060 1297089 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 01:21:52 2019 -0400 All changes made and merged! commit e5b60606096a0e2ec16ed53ce5b53936fb0bbf6d Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 01:18:22 2019 -0400 need to do this till I figure out how to do otherwise commit 12970896da5afcbfa6f3635ac918cbb2a778f660 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 01:16:15 2019 -0400 changing colors commit d1b30306f473f499d1e0d5b60e11698ecd2eda6c Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 00:52:59 2019 -0400 if this works, I'm hackerman! commit 807d815b9f1f0c0f9a6638c3106d0f542567314b Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 00:00:35 2019 -0400 taking away the extra \n commit 4cc5d848e9de117c26f12d4f8ab12826d9acca7b Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 21 00:00:05 2019 -0400 back to /dev/null commit fce4f6cb49f189b82c5c9c94b7181277e6ce0f21 Merge: 74a076b 13ad38f Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 23:22:56 2019 -0400 merge and fix(?) commit 13ad38f97d4d24c803b9bafc9896c10d0f1d1688 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 23:20:43 2019 -0400 a bit more echo changes commit 643dd13c924a53104c6fdeabfb7fd19533998cff Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 23:18:25 2019 -0400 oops... commit 74a076b96a3f4ecf290f921d74f603bf395884c9 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 22:53:02 2019 -0400 forgot that issue... commit b8b0579adb012038b3610c3245b67db0080978f5 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 22:51:38 2019 -0400 added color to everything else commit d3636b3c8959de57773690312839dc86c1790f57 Merge: fa20090 9259440 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 22:50:02 2019 -0400 Merge branch 'entrypoint' into entrypoint_supervisor commit 9259440ce8cc8feb71e0183f8b38fc23c3e8ad01 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 22:49:37 2019 -0400 added colors! commit 66cabc4e48820b8b99e7bbe8b2cec1c6f884e367 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:53:40 2019 -0400 removing that line, as its useless commit fa20090f762e497293ebe7a2c36bcf590834b57a Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:50:40 2019 -0400 Added that logging commit 25169ef806c65af72f68d9033bfa80876b9af91d Merge: 7a1fdef 9f29df4 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:48:40 2019 -0400 Merge branch 'entrypoint' into entrypoint_supervisor commit 9f29df4ee4523df986637937dfad98aa42664267 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:48:26 2019 -0400 more logging! commit 7a1fdefa7237331a760d1eecd538017073e78cea Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:46:50 2019 -0400 added config printing for nginx and supervisor commit 192240dafd69fdfcb8f096de28921e22618c0d2d Merge: 01c07fb edb1a7c Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:44:33 2019 -0400 merge in entrypoint commit edb1a7c1b707cc14f346a7d923bc15cdffe64dc6 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:43:39 2019 -0400 added better logging (I think, might need to move it tho) commit 1412e9ee8759aaaf6c0facb2cd958a7bf897c98f Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:31:52 2019 -0400 adding port config for socketio commit 01c07fbf55cbd58f35ace1a48f49fe6b71a215af Merge: db40f20 9d4349a Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 20 13:27:11 2019 -0400 merge changes from entrypoint commit db40f20329be80668eed0163c717928578ccbe81 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 23:06:34 2019 -0400 why... commit 9d4349a954178a30a93b655cf0283df50574ed90 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 23:00:40 2019 -0400 why is it always the technical stuff... commit d78707ead0049c5b68374c4dad8886f5b7a0964d Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 22:37:55 2019 -0400 Revert "trying something new..." This reverts commit 014dbe86c7cc1b479c397b79f9fcb9a32a07f6cc. commit 63fd89d132a2afdbfc76ac1d9b6d0af99d014891 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 22:29:59 2019 -0400 this might take care of this issue commit b7c1129d3a06acb7ef7845f9ff82f6625888f1fd Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 22:18:20 2019 -0400 that was dumb #2 commit f109a5b33f187cbb13510b0d51a6abf316c05040 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 21:58:41 2019 -0400 fix one last issue commit 00460c5919dbba25258c68a02726fc82eb038c56 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 21:44:59 2019 -0400 solved an issue and refractored in the process commit 014dbe86c7cc1b479c397b79f9fcb9a32a07f6cc Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 21:42:05 2019 -0400 trying something new... commit e08fa7533b980fdc531fe6ea717f60ecd8e6b570 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 21:36:02 2019 -0400 refractoring commit 265f5c47ba07d66e833b61eeb88eabd3650a5be0 Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 21:30:15 2019 -0400 "root" is the new "123" commit 8e719924fb2ddb77de68a405d61d37bc6516b70d Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Mar 19 21:08:08 2019 -0400 Fixed the rest of the typos and changed the wntrypoint a bit commit ad04e8e52840961b05b80f6ff42b754de688fff9 Author: chabad360 <chabad360@users.noreply.github.com> Date: Tue Mar 19 00:52:45 2019 -0400 Where did that come from? commit eab3879578575cf644c2485f62972808dc43194e Author: chabad360 <chabad360@users.noreply.github.com> Date: Tue Mar 19 00:36:03 2019 -0400 The most annoying one letter typo yet... commit 4c429f244b373424157c019226c74acfc4bdc1d1 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Mar 18 22:13:05 2019 -0400 looks like we were missing supervisor and nginx... commit b96e10c31e91c6f6c25acd50107d0033f5a4de4f Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Mar 18 21:58:33 2019 -0400 added some logging commit df749ea839769939556e0ea98c1f8b5267a310c6 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Mar 18 21:41:31 2019 -0400 so forget that, NVM! commit 1b91cc175d3e43afd56dbdd7f078a295679a4a36 Merge: 4d63157 2e38c32 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Mar 18 21:23:53 2019 -0400 Merge branch 'entrypoint_supervisor' of github.com:chabad360/frappe_docker into entrypoint_supervisor commit 4d6315752b29fbee04e2b65ce3fbd4544770e1d5 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Mar 18 21:08:47 2019 -0400 changing some stuff and tests commit 2e38c32c39dd9d65d8a762d49894b34a0e109e21 Author: chabad360 <chabad360@users.noreply.github.com> Date: Fri Mar 15 01:40:38 2019 -0400 Adding a conf.d to nginx commit 1f1f0d1f2cef0ac5868644bfedcfc6fe86b8d230 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 23:35:12 2019 -0400 adding some more auto config commit b49a764ca810b3534f2e1801c8e22f2704b7b22c Merge: 0897ad8 fefe46c Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 23:22:42 2019 -0400 Merge branch 'entrypoint' into entrypoint_supervisor commit fefe46c6dd30f6a38d1708e1c93a805612a77f22 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 23:22:14 2019 -0400 fixing an issue with downloads (moving to wget) commit 0897ad836d3411e014258160b4de58f39c170280 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 23:11:21 2019 -0400 integrating with dockerize commit f2568acd8027d370cd8b9671a8d27ebb24831124 Merge: 3d9bc1a 28c536a Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 23:01:58 2019 -0400 merge in changes from main branch commit 28c536a0b2ca14dd158dfe4384dfc9bac4444264 Merge: ac1a873 6097c8a Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 22:58:11 2019 -0400 Merge branch 'entrypoint_dockerize' into entrypoint commit 6097c8a4ccf88b4b73e561f8e6f69067c3e07f21 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 22:34:38 2019 -0400 fixed an issue caused by a rebase commit 3d9bc1ae07fa5c3bf82a546318b0e17ca89ac5dc Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 22:19:43 2019 -0400 should take care of nginx giving 404s commit 941cae493c394318cb8fc8df02685561bd4dc4df Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 00:54:38 2019 -0400 adding logging and fixing MORE typos... commit bfc2339d87bc10a1d18a9cebf542ab1948fe3586 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 00:13:17 2019 -0400 so many typos! commit fbd759fff58c9109a70f85df58037efeec5276c2 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 13 23:56:36 2019 -0400 that was dumb... commit 0d8ac569629c1258699a341c288e7adb261fc5db Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 21:16:59 2019 -0400 looks like we have some exit issues commit c6a753398cc6994b92ef7cf3cbaf9708ea0f0c07 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 21:03:20 2019 -0400 I think I got it! commit 2a78871247c9368b06d84b266708e8145e783017 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 01:08:37 2019 -0400 trying things here... commit 86da948a96f43baa869cfb13c2e026328758bb65 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 00:56:02 2019 -0400 I've litterally no clue whats wrong... commit e53191688a40b5a233923a1d0a02c3f0460fc1c1 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 00:35:28 2019 -0400 ok... I see the issue now... (I hope) commit ac1a873796c9f5cc4df2ad1c569337f3f4674d56 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 14 00:13:17 2019 -0400 that seems to be the issue commit 0b76fa6cace422b166dd6aea1ad24d956605135e Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 13 23:59:56 2019 -0400 small typo commit f5583cfaea7c54cbade457fd81ce748338643a9e Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 13 23:56:36 2019 -0400 that was dumb... commit dc85deedee6a0dca67d02baaba8bfb3dd556e715 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 13 22:04:41 2019 -0400 lets get this to work commit 8186afda0422460d46cb9c4ab13becd50879008d Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 13 22:00:26 2019 -0400 atempting to integrate dockerize into the entrypoint commit de772000f227d5fac0f7aa46f0ee53915811e2da Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 13 21:32:30 2019 -0400 making some fixes and changes commit 5d8aa3d0e7b11d1f74ee6699a7df4edcbbd64f81 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Mar 11 21:50:35 2019 -0400 just trying to prove it works, then we'll move to fancier things commit 146c3c6b65bf492c60f2d3c39042811e7660272b Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Mar 11 21:42:48 2019 -0400 Revert "working to add supervisor to replace bench start" This reverts commit ddd445756233e645fbf56d48c5d15d06353fa200. commit ddd445756233e645fbf56d48c5d15d06353fa200 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Mar 10 01:39:05 2019 -0500 working to add supervisor to replace bench start commit cb5b1f6feb21174f7d7b4b0d207bc8634eeb5b29 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Mar 8 00:12:10 2019 -0500 more logging! commit b4c3a542584597af4a1bc5ab0b26ac6cf3aef434 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 7 22:14:01 2019 -0500 giving it another minute commit 29d92ea99f5c9ad18e31984b2e159bfcaeb79290 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 7 17:37:15 2019 -0500 giving a bit more time commit 38d8e12ef1b52ca1a9bd3454f2951d406e04c54a Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 7 17:23:04 2019 -0500 small issue prevents seeing the logging commit 1787d502415da07a336c07dfe64fb601a01a0202 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 7 17:14:57 2019 -0500 added some logging commit fd25996467a3cbc4f988584d2994d951f0a11e27 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Mar 7 00:43:26 2019 -0500 this should work commit 72314783051f6fa1d1c5eab70649d6776ed34e51 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 6 23:44:44 2019 -0500 oops... commit 631b9f49f6c263eb7b3349f9705f83ec7352b7da Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 6 23:32:09 2019 -0500 keeping the test from launching its own bench commit 547dbaba010532e3390e889b5bed9d342df8200c Merge: 177264ba36de81Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 6 23:30:42 2019 -0500 Merge in changes from develop commit 177264ba5a6f85d0cb43bd2e7e64b6722ceb94e0 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Mar 6 23:09:12 2019 -0500 trying to implement su-exec due to volumes commit 18d1e383ab33154709ec996ccea920bac40e557b Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Mar 1 16:32:46 2019 -0500 removed su-exec, useless (at least for now) commit 10e8145d1b17c72cafeaad390e6433eabac36243 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Mar 1 00:14:26 2019 -0500 hopfully this will work commit d6b89df296280e1e9d7a4f0204278a069cbfc59e Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 28 23:51:04 2019 -0500 additional fixes commit 95cd7f3aa5cb3e6999386fc1aa1aff9205b7ed85 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 28 23:29:44 2019 -0500 trying this fix commit 4a0ed1fc49421b611a909fa224ffcb13a7b2499a Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 28 23:04:03 2019 -0500 Not needed anymore, they're anyways auto-generated commit 45eca862febfe83d9821fb9a6629211556a3e1bc Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 28 23:03:04 2019 -0500 Allows you to change the name of the service hosts without wonky tricks commit 2737c5a5367ff0f1453cdab5f3f91e9367b4157c Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 28 22:54:57 2019 -0500 atempting to move away from sudo use commit 9282c77f31168d93630a3fbad8c935802958e94d Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 28 22:01:13 2019 -0500 added in su-exec commit ad9057f312fe02dceb1207bb52eb26343cc3d647 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 21 10:27:46 2019 -0500 found the root cause of the issue, and it should be gone now commit 686d814b7a90416083187df969eea415772f627f Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 21 09:52:56 2019 -0500 fixing the healthcheck commit a3670f934299d5c212aff834744f9267c6c2142e Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 21 09:52:47 2019 -0500 some changes for travis commit d7e84dc33f5e6b59e290e46be497bc0740f3aa57 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 21 00:43:33 2019 -0500 mixed up Procfile and common_site_config... commit 8d2bf9dbba982a55cbef2eb7c16fd3635493665b Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 21 00:39:52 2019 -0500 mixed up Procfile and common_site_config... commit 6eb6a862b7ba63fe7b396eaa93a50aa8fa4b554b Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 21 00:33:19 2019 -0500 fixing some issues with the entrypoint, plus fixed a typo in compose file commit 182676b9ff96422dc1889fe4fe8d1a45fe3f57d5 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Feb 20 23:43:50 2019 -0500 moving to absolute file refs commit 1e01ae0d7cccaf58d8db1cb99ecb8ed3a3cb51f6 Merge: 03214f8 37f0b21 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Feb 20 21:49:47 2019 -0500 merge in basic changes, plus small changes is entrypoint commit 03214f82ca63ed6d7d340823a5194cadad9d8e70 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Feb 20 21:48:29 2019 -0500 fixing a few issues commit 37f0b21afb563f6255bb4b488b02f20e4199f3f4 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Feb 20 00:34:15 2019 -0500 small fix for dockerfile commit 726ec5080c56755102e7c4e97bcfacc9125efe56 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Feb 20 00:30:50 2019 -0500 fixed some issues commit 79e5066cbad4a76f80addb84bc3b88c9b0550dec Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Feb 20 00:24:19 2019 -0500 refractored the dockerfile a bit commit 07127e56a6cdd1d4de12ab9f28f9f7c21b6ee3ca Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Feb 19 23:16:48 2019 -0500 made trvis wait instead commit c38bef30fa634ff88ec1bc8fa4e6463cb8792e91 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Feb 18 07:19:47 2019 -0500 moved somemore things around in the entrypoint commit 02b188543729292d0a1aab79b9208a857a7264c7 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 17 23:27:10 2019 -0500 added a healthcheck script commit 89ece6dc186129896738dd618a7ce968c935e01c Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 17 23:25:29 2019 -0500 Fixed up the whole bench launch script for something more stable commit 3658393976d8f082b77669392a5c29c00dd690cb Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 17 23:24:44 2019 -0500 did some moving around commit 8c6a3a2d78133ff1d634862e23eacfa229b886bf Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 17 23:05:40 2019 -0500 added starting bench to the entrypoint commit 820a739c69fe898afc070553cbbb3097b04845d5 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 17 23:04:45 2019 -0500 adding enviorment variables to dockerfile commit 8c47f1766a5621fa35dcf130343bb7fd2218052f Merge: 4e84305 2909d29 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 17 22:28:43 2019 -0500 merging in the updates commit 2909d2950042dfe5d82ae7d0d002b67732ce8e14 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 17 22:23:46 2019 -0500 Updating dbench in some areas commit 0c00ee5724e783e4a579cadecedfabc19cf639ec Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 17 22:23:21 2019 -0500 Making some small changes commit 89e7a997b8c7c2ccf863c9b5ef575f8a9da8d763 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 14 22:55:29 2019 -0500 moving some things around commit 3a705b1b41c7b4da98167c0a11a199167807c5d8 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Feb 14 22:26:13 2019 -0500 some syntax changes commit c1249c1edb1b157b9f7f458d693c677f0e4bcee2 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Feb 10 12:03:51 2019 -0500 implementing codacy sugestions commit 2f3452628b9900df1c4381a41d3480d5fd33128b Author: Mendel Greenberg <chabad360@gmail.com> Date: Tue Jan 29 00:02:12 2019 -0500 fixed a small dbench typo commit 4e843056d8fd9afa0bcd97be545a3942aa218d85 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jan 28 23:28:18 2019 -0500 docker is acting odd about some perms commit f8cd193844c38d6f67b8cadb5ca4aaa0c1cf360a Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jan 28 23:25:46 2019 -0500 added a .d commit b47ba7fad924c11b2fecb4b69aa0493193e31e45 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jan 28 23:23:02 2019 -0500 adding some debbuging and forcing proper echos commit 8f7efc9311e2f04a4dab3600b7016be2b64873bf Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Jan 27 07:17:21 2019 -0500 fixed a small typo commit de612c6b65f59fdaa90b5523fc46d1aaa7f6e863 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Jan 27 07:14:18 2019 -0500 some refractoring commit 4cafdbd957b548aef39ea48c855dac93b5e35611 Author: chabad360 <chabad360@gmail.com> Date: Fri Jan 25 19:23:20 2019 +0000 docker aint quiting now commit ad5edb89b75a853218ffbee23651beeb5cc8edec Author: chabad360 <chabad360@gmail.com> Date: Fri Jan 25 18:26:04 2019 +0000 forgot to add an entrypoint line commit 7aebb1e8395eb71d1775be20d33b1ea662060c3c Author: chabad360 <chabad360@gmail.com> Date: Fri Jan 25 18:18:03 2019 +0000 some syntax errors... commit 0ece44fd019f502347aee9772e1ea41058ad2b35 Author: chabad360 <chabad360@gmail.com> Date: Fri Jan 25 17:53:04 2019 +0000 bringing chown in dbench back commit 6166c985397bb1dd214ca6f03faab75dbb74cd62 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Jan 25 07:10:27 2019 -0500 added the compose files to the .dockerignore commit 3446b2b60bf15ea073b8ee02a0f3cf3b12331044 Author: chabad360 <chabad360@gmail.com> Date: Fri Jan 25 18:12:15 2019 +0000 adding a travis job matrix which supports stack commit 75ec1905a1e49bf1fa3292166cba24f24f29392d Author: chabad360 <chabad360@gmail.com> Date: Fri Jan 25 17:53:04 2019 +0000 bringing chown in dbench back commit 9304ee6e4e1934f429a46e41723dc157b611b038 Author: chabad360 <chabad360@users.noreply.github.com> Date: Fri Jan 25 11:30:46 2019 -0500 typos... commit b9ab8bd84bda749ee0d404f648dbd75a9dff822a Author: chabad360 <chabad360@users.noreply.github.com> Date: Fri Jan 25 11:28:06 2019 -0500 Updating travis' docker and compose This is the commit message #3: commit 64ac1be8d8ef63c36afd4c2bacf5d9bf2a14ed56 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Jan 25 07:10:27 2019 -0500 added the compose files to the .dockerignore commit 24ca072f2908da4fb368b02665d2c193f7378dde Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 07:09:13 2019 -0500 added some comments to the Dockerfile commit 0934c7ffd0fdecaf1a4d4a6f3918e3dd6c59e1d0 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 06:52:15 2019 -0500 doing some refractoring, moved docker-compose.yml back to without networks commit e06c37eb6de33b38fc946890cb8c71a2f4545164 Author: chabad360 <chabad360@users.noreply.github.com> Date: Fri Jan 25 11:31:49 2019 -0500 typos... commit 7bc52d79f8be7f2e8ac570022761707bc57200d4 Author: chabad360 <chabad360@users.noreply.github.com> Date: Fri Jan 25 11:28:38 2019 -0500 readding compose commit 44c4bff68591fa4c13704af889a4ef95191bc1a5 Author: chabad360 <chabad360@users.noreply.github.com> Date: Fri Jan 25 11:22:12 2019 -0500 fixed travis commit f639cedf1791f7c4c40e1dbdfa3ffbee83cfc9e9 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Jan 25 06:52:13 2019 -0500 since i moved the entryscript to an actual ENTRYPOINT, now moving the output files to different names, so they dont get removed commit 5726af869485935525477cbbd9000707ad16970c Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 21:30:45 2019 -0500 a bit of refractoring commit 88c03253d061aa1612164fda714d9a1c5164656d Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 21:12:34 2019 -0500 some small changes commit 5767ccc7f07143776b08908a1bb5c825f7641af4 Merge: d81c7f2 ac98301 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 21:10:21 2019 -0500 merge in everything commit ac983010e2f63224f530661f394e72107f875b9f Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 07:09:13 2019 -0500 added some comments to the Dockerfile commit 42d09a44d6b88eac2a351e7869b4f8dc5b939a1b Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 06:52:15 2019 -0500 doing some refractoringmoved docker-compose.yml back to without networks commit bb79f28e83f26466abdbf4ce16fe07905b5255e9 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 06:33:24 2019 -0500 added a .dockerignore and fixed the dockerfile up a bit commit 35c5cdabb9c76c46522703fd13800e91719c9f26 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 06:10:42 2019 -0500 added the frappe folder again commit d44fd9737146750f611632738302009b96076967 Author: Mendel Greenberg <chabad360@gmail.com> Date: Thu Jan 24 06:10:31 2019 -0500 made some fixes to the volumes configuration commit b1a187643d9b0e900dac0b3afa2ed7c0de8dec89 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Jan 23 07:32:32 2019 -0500 moving things around cause compose doesn't like configs commit b9e55f7ee2ec2f16f123e3c37b6032e74a27205a Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Jan 23 07:23:08 2019 -0500 added a .gitignore commit 50815d221dc92c707c89d7466681c1f3741c3769 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Jan 23 07:08:57 2019 -0500 getting closer to a more docker swarm compatible setup commit 15f8e02a0eec1a7c30b1ce88f50285de40d57627 Author: Mendel Greenberg <chabad360@gmail.com> Date: Wed Jan 23 07:06:19 2019 -0500 adding docker configs to make to configuration on the host side easier commit 11bfbbf086f1d5d05eb94fbc2bb986ccf8fd72d6 Author: Mendel Greenberg <chabad360@gmail.com> Date: Mon Jan 21 11:09:03 2019 -0500 Added networks commit c1e0568b3ea8633616f00e73923498938df2c2fd Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Jan 20 07:30:35 2019 -0500 some more slight name changes commit 14e05b16760b7d91f3bdd0dfac25f557d1f49d31 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sun Jan 20 07:02:09 2019 -0500 moving some things around for less lines commit 497186a49ca65a81fe31f6fddd7c2fef630f1bc3 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 21:03:54 2019 -0500 Some more changes to the readme commit 164c53ebc58ba2f2854160b2b38c2b7d9252f08c Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 19:50:32 2019 -0500 changed test.py to avoid naming errors commit 56cdb54bf38b5e52b25c499f9528d6af2debcfca Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 19:50:13 2019 -0500 Changed the readme significantly commit 372fa8aa4826dd736d9fe5ca78d741d95322928e Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Jan 18 16:07:18 2019 -0500 added a docker down feature to dbench and changed some of the docs commit 7c771dd27483d35f11da1aec6d3d32667e20590e Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Jan 18 15:53:53 2019 -0500 moved redis configuration folder into conf/ commit 55fdce6ea396d2a58095810a0d4a09aa381c6d25 Author: Mendel Greenberg <chabad360@gmail.com> Date: Fri Jan 18 07:45:44 2019 -0500 removed adding site names to host (its pointless) commit 64838e2182acbb0e26cdf24927b66d79fbd9feba Author: William Moreno <williamjmorenor@gmail.com> Date: Mon Oct 22 01:11:59 2018 -0600 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> commit 5276e54ff91249f1d4c29518027a432be024f01a Author: chabad360 <chabad360@gmail.com> Date: Fri Oct 19 18:51:12 2018 +0000 bench setup anything-else should work now commit ae001b407664c026ae2650ac7d940b91da1ee5e6 Author: Chinmay Pai <chinmaydpai@gmail.com> Date: Sat Oct 13 17:20:04 2018 +0000 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> commit d81c7f24b3c65893e040098295dc0ae87b40f1d0 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 21:13:28 2019 -0500 working to add an entrypoint system, this is the begining commit f0d86ac5a6158141fb307f37fe955aa2f42ba0f4 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 21:12:06 2019 -0500 updated the readme some more commit 06f4400e64439553f0eedcfbe4e06b18028a9585 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 21:03:54 2019 -0500 Some more changes to the readme commit 785b0b25ddc879d1335ff9c7898054e43c492d9b Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 19:50:32 2019 -0500 changed test.py to avoid naming errors commit 7afca1e051a15a6f24664fff21cb193f3ad44ea7 Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 19:50:13 2019 -0500 Changed the readme significantly commit bacb05706b2c7218dec7e55031ab47d89922af6e Merge:cb1b51ada76847Author: Mendel Greenberg <chabad360@gmail.com> Date: Sat Jan 19 19:49:01 2019 -0500 Merge branch 'master' into develop commitcb1b51a2c3Author: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 22:12:48 2018 +0000 changes some of the wording of the help message commit29e72263acAuthor: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 22:05:26 2018 +0000 added help to dbench, and updated readme commit5529ba4d40Author: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 21:35:19 2018 +0000 Travis! commit4a3aa8042eAuthor: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 20:11:11 2018 +0000 oops, but only for travis, this runs fine commit50d595e261Author: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 20:03:06 2018 +0000 Oops... commit581966352dAuthor: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 19:57:59 2018 +0000 fixed travis, and cleaned up dbench a little commitcde3a5ce0dMerge:d9dcc0de079c47Author: chabad360 <chabad360@users.noreply.github.com> Date: Fri Oct 5 12:35:49 2018 -0700 Merge branch 'master' into develop commitd9dcc0dd01Author: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 19:31:09 2018 +0000 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 commitbef1dee945Merge:23ea21e3356edfAuthor: chabad360 <chabad360@users.noreply.github.com> Date: Fri Oct 5 12:22:23 2018 -0700 Merge pull request #3 from chabad360/master Update Dockerfile commit3356edf0bbAuthor: chabad360 <chabad360@users.noreply.github.com> Date: Fri Oct 5 11:45:06 2018 -0700 all installs are in one apt command commit23ea21efb8Author: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 05:50:10 2018 +0000 Fixed argument issue, should work now commitfbe00a376fAuthor: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 05:21:20 2018 +0000 this is more complicated than i thought commitda8d7a9da7Author: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 05:16:07 2018 +0000 apparently, new-site issue is because of wrong dir commit720e0bcf76Author: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 05:10:22 2018 +0000 hopefully should fix the args issue commitd1a544121cAuthor: chabad360 <chabad360@gmail.com> Date: Fri Oct 5 02:55:43 2018 +0000 Removed MAINTAINER in favor of LABEL commit08ea52ef1fAuthor: chabad360 <chabad360@users.noreply.github.com> Date: Thu Oct 4 18:59:57 2018 -0700 Removed extra line commit6b7b49089bAuthor: chabad360 <chabad360@users.noreply.github.com> Date: Thu Oct 4 18:59:18 2018 -0700 Condensed Dockerfile Updated to latest node, and uses python-pip, also condensed a lot the Dockerfile.
This commit is contained in:
chabad360
parent
441f0916d4
commit
fec242800e
12 changed files with 344 additions and 92 deletions
|
|
@ -3,7 +3,6 @@ dist: xenial
|
|||
env:
|
||||
- DOCKER_COMPOSE_VERSION: 1.23.1
|
||||
|
||||
|
||||
services:
|
||||
- docker
|
||||
|
||||
|
|
@ -20,11 +19,9 @@ before_install:
|
|||
install:
|
||||
- chmod ugo+x ./dbench
|
||||
- chmod ugo+x ./test.sh
|
||||
- ./dbench setup docker
|
||||
- ./dbench init frappe-bench
|
||||
- ./dbench new-site site1.local
|
||||
- ./dbench setup hosts
|
||||
- ./dbench setup docker &
|
||||
- sleep 8m
|
||||
|
||||
script:
|
||||
- ./test.sh
|
||||
- ./dbench setup docker stop
|
||||
- ./dbench setup docker down
|
||||
|
|
|
|||
60
Dockerfile
60
Dockerfile
|
|
@ -3,6 +3,11 @@
|
|||
FROM debian:9.6-slim
|
||||
LABEL author=frappé
|
||||
|
||||
|
||||
# Add entrypoint
|
||||
COPY ./docker-entrypoint.sh /bin/entrypoint
|
||||
|
||||
# Install locales
|
||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends locales \
|
||||
&& sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
|
||||
&& dpkg-reconfigure --frontend=noninteractive locales \
|
||||
|
|
@ -16,31 +21,48 @@ ENV LC_ALL=en_US.UTF-8
|
|||
|
||||
# Install all neccesary packages
|
||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-suggests --no-install-recommends \
|
||||
build-essential cron curl git libffi-dev liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev libssl-dev libtiff5-dev \
|
||||
libwebp-dev mariadb-client iputils-ping python-dev python-pip python-setuptools python-tk redis-tools rlwrap \
|
||||
software-properties-common sudo tk8.6-dev vim xfonts-75dpi xfonts-base wget wkhtmltopdf \
|
||||
build-essential cron curl git iputils-ping libffi-dev liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev \
|
||||
libssl-dev libtiff5-dev libwebp-dev mariadb-client nginx python-dev python-pip python-setuptools python-tk redis-tools rlwrap \
|
||||
rlwrap software-properties-common sudo supervisor tk8.6-dev vim xfonts-75dpi xfonts-base wget wkhtmltopdf \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||
&& curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb > node.deb \
|
||||
&& dpkg -i node.deb \
|
||||
&& rm node.deb \
|
||||
&& npm install -g yarn
|
||||
|
||||
# Add frappe user and setup sudo
|
||||
RUN groupadd -g 500 frappe \
|
||||
&& wget https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb -O node.deb \
|
||||
&& dpkg -i node.deb && rm node.deb \
|
||||
&& npm install -g yarn \
|
||||
&& pip install -e git+https://github.com/frappe/bench.git#egg=bench --no-cache \
|
||||
&& wget https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz -O - | tar xzv \
|
||||
&& cd su-exec-* && make \
|
||||
&& mv su-exec /usr/local/bin \
|
||||
&& cd .. && rm -rf su-exec-* \
|
||||
&& wget https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz -O - | tar xzv -C /usr/local/bin \
|
||||
&& groupadd -g 500 frappe \
|
||||
&& useradd -ms /bin/bash -u 500 -g 500 -G sudo frappe \
|
||||
&& printf '# Sudo rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/frappe \
|
||||
&& chown -R 500:500 /home/frappe
|
||||
&& chown -R 500:500 /home/frappe\
|
||||
&& chmod 777 /bin/entrypoint
|
||||
# ^^ Saves a layer
|
||||
|
||||
# Install bench
|
||||
RUN pip install -e git+https://github.com/frappe/bench.git#egg=bench --no-cache
|
||||
# Add templates
|
||||
COPY --chown=500:500 ./frappe-templates /home/frappe/templates
|
||||
|
||||
USER frappe
|
||||
EXPOSE 80 6787 8000 9000
|
||||
|
||||
# Add some bench files
|
||||
COPY --chown=frappe:frappe ./frappe-bench /home/frappe/frappe-bench
|
||||
VOLUME [ "/home/frappe/frappe-bench" ]
|
||||
|
||||
WORKDIR /home/frappe/frappe-bench
|
||||
ENV MYSQL_ROOT_PASSWORD="root"
|
||||
ENV ADMIN_PASSWORD="admin"
|
||||
ENV SITE_NAME="localhost"
|
||||
|
||||
EXPOSE 8000 9000 6787
|
||||
# These are here because you never know, people may want to change them (for some odd reason), so we need to set defaults.
|
||||
ENV REDIS_CACHE_HOST="redis-cache"
|
||||
ENV REDIS_QUEUE_HOST="redis-queue"
|
||||
ENV REDIS_SOCKETIO_HOST="redis-socketio"
|
||||
ENV MARIADB_HOST="mariadb"
|
||||
ENV WEBSERVER_PORT="8000"
|
||||
ENV SOCKETIO_PORT="9000"
|
||||
ENV BENCH="/home/frappe/frappe-bench"
|
||||
ENV DEV_MODE="false"
|
||||
|
||||
VOLUME [ "/home/frappe/frappe-bench" ]
|
||||
HEALTHCHECK --start-period=5m \
|
||||
CMD curl -f http://localhost || echo "Curl failure: $?" && exit 1
|
||||
|
||||
ENTRYPOINT [ "/bin/entrypoint" ]
|
||||
|
|
|
|||
25
README.md
25
README.md
|
|
@ -12,34 +12,25 @@ Unfortunately, this container is not curently suited for a production environmen
|
|||
|
||||
### Build the container and initialize the bench
|
||||
|
||||
**Note:** These instructions assume you have both [Docker](https://docs.docker.com/engine/installation) and [Docker Compose](https://docs.docker.com/compose/install/) installed on your system.
|
||||
**Note:** These instructions assume you have both [Docker](https://docs.docker.com/engine/installation) and [Docker Compose](https://docs.docker.com/compose/install/) installed on your system.
|
||||
|
||||
1. Clone this repo and change your working directory to it:
|
||||
|
||||
```bash
|
||||
git clone https://github.com/frappe/frappe_docker.git
|
||||
cd frappe_docker/
|
||||
cd frappe_docker
|
||||
```
|
||||
|
||||
2. Build and start the container, and initialize the bench:
|
||||
|
||||
```bash
|
||||
./dbench setup docker
|
||||
./dbench init
|
||||
```
|
||||
|
||||
**Note:** This will take a while, as docker will now build the container.
|
||||
**Note:** This will take a while, as docker will now build the container, and frappe will automaticly setup and start. please wait about 5-10 minutes before continuing.
|
||||
|
||||
3. Add a new site and start Frappe:
|
||||
|
||||
```bash
|
||||
./dbench new-site site1.local
|
||||
./dbench setup hosts
|
||||
./dbench start
|
||||
```
|
||||
|
||||
4. Use Frappe:
|
||||
Open your browser to `localhost:8000/login`. Then login using the username `Administrator` and the password `admin`.
|
||||
3. Use Frappe:
|
||||
Open your browser to `localhost/login`. Then login using the username `Administrator` and the password `admin`.
|
||||
|
||||
### Basic Usage of `./dbench`
|
||||
|
||||
|
|
@ -51,8 +42,6 @@ Unfortunately, this container is not curently suited for a production environmen
|
|||
- `stop`: Stops the containers with `docker-compose stop`.
|
||||
- `down`: Deletes the containers and the coresponding volumes with `docker-compose down`.
|
||||
|
||||
- `./dbench setup hosts`: Adds all sites to the containers hosts file.
|
||||
**Note:** Run this after you've added a new site to avoid errors.
|
||||
|
||||
- `./dbench -c frappe | root <command to run>`: Runs a command in the container, as the selected user.
|
||||
|
||||
|
|
@ -60,10 +49,6 @@ Unfortunately, this container is not curently suited for a production environmen
|
|||
|
||||
- `./dbench <bench command>`: Runs a command in bench (i.e. Running `./dbench new-site site1.local`, will run `bench new-site site1.local` in the container).
|
||||
|
||||
## For More Info
|
||||
|
||||
For more info on building this docker container refer to this [Wiki](https://github.com/frappe/frappe_docker/wiki/Hitchhiker's-guide-to-building-this-frappe_docker-image)
|
||||
|
||||
## Contributing
|
||||
|
||||
Feel free to contribute to this project and make it better.
|
||||
|
|
|
|||
24
dbench
24
dbench
|
|
@ -8,10 +8,6 @@ function run () {
|
|||
|
||||
if [[ $# -eq 0 ]]; then
|
||||
docker exec -it frappe bash
|
||||
elif [[ "$1" == 'init' ]]; then
|
||||
run root "chown -R frappe:frappe /home/frappe"
|
||||
run frappe "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation && cd frappe-bench"
|
||||
run frappe "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb"
|
||||
elif [[ "$1" == 'setup' ]]; then
|
||||
if [[ "$2" == 'docker' ]]; then
|
||||
if [[ "$3" == '--swarm-mode' ]]; then
|
||||
|
|
@ -20,15 +16,12 @@ elif [[ "$1" == 'setup' ]]; then
|
|||
docker-compose down
|
||||
elif [[ "$3" == 'stop' ]]; then
|
||||
docker-compose stop
|
||||
else
|
||||
elif [[ "$3" == '-d' ]]; then
|
||||
docker-compose up -d
|
||||
else
|
||||
|
||||
docker-compose up
|
||||
fi
|
||||
elif [[ "$2" == 'hosts' ]]; then
|
||||
a=$(run frappe "ls sites/*/site_config.json | grep -o '/.\+/'")
|
||||
a="${a//$'\n'/ }"
|
||||
a=$(echo "$a" | tr -d / )
|
||||
result="127.0.0.1 ${a}"
|
||||
run root "echo ${result} | tee -a /etc/hosts"
|
||||
else
|
||||
IFS=" "
|
||||
run frappe "bench $*"
|
||||
|
|
@ -49,10 +42,11 @@ elif [[ "$1" == '-h' ]]; then
|
|||
echo " Launches you into an interactive shell in the container as user frappe"
|
||||
echo " $0 <command to send to bench>"
|
||||
echo " Runs the bench command <command>, i.e. $0 new-site \"site1.local\" = bench new-site \"site1.local\""
|
||||
echo " $0 setup docker [ stop | down ]"
|
||||
echo " Builds and starts the docker containers using \"docker-compose up -d\""
|
||||
echo " $0 setup hosts"
|
||||
echo " Adds all site names to the containers hosts file"
|
||||
echo " $0 setup docker [ -d | stop | down ]"
|
||||
echo " Builds and starts the docker containers using \"docker-compose up\""
|
||||
echo " -d | Run containers in a detatched mode"
|
||||
echo " stop | Stops containers"
|
||||
echo " down | Deletes containers and assosiatated files (other than the files in volumes)."
|
||||
echo " $0 -c frappe | root <command to run>"
|
||||
echo " Runs a command in the container, as the selected user"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@ services:
|
|||
image: mariadb
|
||||
|
||||
environment:
|
||||
- MYSQL_ROOT_PASSWORD=123
|
||||
- MYSQL_USER=root
|
||||
|
||||
- MYSQL_ROOT_PASSWORD=root
|
||||
|
||||
volumes:
|
||||
- ./conf/mariadb-conf.d:/etc/mysql/conf.d
|
||||
- /var/lib/mysql
|
||||
|
||||
|
||||
ports:
|
||||
- "3307:3306" # MariaDB Port
|
||||
|
||||
container_name: mariadb
|
||||
|
||||
|
||||
redis-cache:
|
||||
image: redis:alpine
|
||||
|
||||
|
|
@ -26,6 +26,7 @@ services:
|
|||
|
||||
container_name: redis-cache
|
||||
|
||||
|
||||
redis-queue:
|
||||
image: redis:alpine
|
||||
|
||||
|
|
@ -37,6 +38,7 @@ services:
|
|||
|
||||
container_name: redis-queue
|
||||
|
||||
|
||||
redis-socketio:
|
||||
image: redis:alpine
|
||||
|
||||
|
|
@ -56,15 +58,14 @@ services:
|
|||
- ./conf/redis-conf.d/redis_cache.conf:/home/frappe/frappe-bench/config/redis_cache.conf
|
||||
- ./conf/redis-conf.d/redis_queue.conf:/home/frappe/frappe-bench/config/redis_queue.conf
|
||||
- ./conf/redis-conf.d/redis_socketio.conf:/home/frappe/frappe-bench/config/redis_socketio.conf
|
||||
|
||||
ports:
|
||||
- "8000:8000" # Webserver Port
|
||||
- "9000:9000" # Socketio Port
|
||||
- "6787:6787" # File Watcher Port
|
||||
- "8000:8000" # Webserver port
|
||||
- "9000:9000" # Socketio port
|
||||
- "6787:6787" # File Watcher port
|
||||
- "80:80" # Nginx Port
|
||||
|
||||
stdin_open: true
|
||||
tty: true
|
||||
|
||||
links:
|
||||
- redis-cache
|
||||
- redis-queue
|
||||
|
|
|
|||
50
docker-entrypoint.sh
Normal file
50
docker-entrypoint.sh
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
#!/bin/bash
|
||||
|
||||
chown -R 500:500 "${BENCH}"
|
||||
|
||||
# Setup bench
|
||||
if [[ ! -d "${BENCH}/sites" ]]; then
|
||||
su-exec frappe bench init "${BENCH}" --ignore-exist --skip-redis-config-generation --verbose
|
||||
fi
|
||||
|
||||
# Make sure Redis is up
|
||||
dockerize -wait "tcp://${REDIS_CACHE_HOST}:13000" -wait "tcp://${REDIS_QUEUE_HOST}:11000" -wait "tcp://${REDIS_SOCKETIO_HOST}:12000"
|
||||
# Make sure MariaDB is up
|
||||
dockerize -wait "tcp://${MARIADB_HOST}:3306"
|
||||
|
||||
# Individualy add bench config file
|
||||
dockerize -template /home/frappe/templates/procfile.tmpl:${BENCH}/Procfile # Procfile
|
||||
dockerize -template /home/frappe/templates/common_site_config.tmpl:${BENCH}/sites/common_site_config.json # common_site_config.json
|
||||
dockerize -template /home/frappe/templates/nginx.tmpl:/etc/nginx/conf.d/frappe.conf # Nginx config for Frappe
|
||||
dockerize -template /home/frappe/templates/supervisord.tmpl:/etc/supervisor/conf.d/frappe.conf # Supervisor config for Frappe Services
|
||||
|
||||
cd "${BENCH}" || exit 1
|
||||
|
||||
# Add a site if its not there (useful if you're doing multitenancy)
|
||||
if [[ ! -d "${BENCH}/sites/${SITE_NAME}" ]]; then
|
||||
su-exec frappe bench new-site "${SITE_NAME}" --verbose
|
||||
fi
|
||||
|
||||
# Make sure frappe is built
|
||||
su-exec frappe bench build
|
||||
|
||||
# Print all configuration
|
||||
function output () {
|
||||
TITLE=$2 NAME=${3:-$(echo "$1" | grep -o '\([^\/\\]\+\.\w\+\)$')} awk 'BEGIN{print "\033[1;36m" ENVIRON["TITLE"] \
|
||||
":\n\033[0;31m" ENVIRON["NAME"] "\t|\033[1;31m ------------------------------------------------------------------------\033[0m"} \
|
||||
{print "\033[0;31m" ENVIRON["NAME"] "\t| \033[0m" $0} END{print "\033[0;31m" \
|
||||
ENVIRON["NAME"] "\t|\033[1;31m ------------------------------------------------------------------------\033[0m\n"}' $1
|
||||
}
|
||||
|
||||
echo -e "\n\033[1;36mConfiguration:"
|
||||
output ${BENCH}/Procfile "Bench Procfile"
|
||||
output ${BENCH}/sites/common_site_config.json "Bench Common Site Config"
|
||||
output /etc/nginx/nginx.conf "Nginx config"
|
||||
output /etc/nginx/conf.d/frappe.conf "Nginx frappe conf"
|
||||
output /etc/supervisor/supervisord.conf "Supervisord config"
|
||||
output /etc/supervisor/conf.d/frappe.conf "Supervisord frappe conf"
|
||||
|
||||
trap "killall \"supervisord\"" HUP INT QUIT TERM
|
||||
|
||||
# Start all services
|
||||
exec supervisord
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
"auto_update": false,
|
||||
"background_workers": 1,
|
||||
"db_host": "mariadb",
|
||||
"file_watcher_port": 6787,
|
||||
"frappe_user": "frappe",
|
||||
"gunicorn_workers": 4,
|
||||
"rebase_on_pull": false,
|
||||
"redis_cache": "redis://redis-cache:13000",
|
||||
"redis_queue": "redis://redis-queue:11000",
|
||||
"redis_socketio": "redis://redis-socketio:12000",
|
||||
"restart_supervisor_on_update": false,
|
||||
"root_password": "123",
|
||||
"serve_default_site": true,
|
||||
"shallow_clone": true,
|
||||
"socketio_port": 9000,
|
||||
"update_bench_on_update": true,
|
||||
"webserver_port": 8000,
|
||||
"admin_password": "admin"
|
||||
}
|
||||
21
frappe-templates/common_site_config.tmpl
Normal file
21
frappe-templates/common_site_config.tmpl
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"auto_update": false,
|
||||
"background_workers": 1,
|
||||
"db_host": "{{ default .Env.MARIADB_HOST "mariadb" }}",
|
||||
"file_watcher_port": 6787,
|
||||
"frappe_user": "frappe",
|
||||
"gunicorn_workers": 4,
|
||||
"rebase_on_pull": false,
|
||||
"redis_cache": "redis://{{ default .Env.REDIS_CACHE_HOST "redis_cache" }}:13000",
|
||||
"redis_queue": "redis://{{ default .Env.REDIS_QUEUE_HOST "redis_queue" }}:11000",
|
||||
"redis_socketio": "redis://{{ default .Env.REDIS_SOCKETIO_HOST "redis_socketio" }}:12000",
|
||||
"restart_supervisor_on_update": false,
|
||||
"root_password": "{{ default .Env.MYSQL_ROOT_PASSWORD "root" }}",
|
||||
"serve_default_site": true,
|
||||
"shallow_clone": true,
|
||||
"socketio_port": {{ default .Env.SOCKETIO_PORT "9000" }},
|
||||
"update_bench_on_update": true,
|
||||
"webserver_port": {{ default .Env.WEBSERVER_PORT "8000" }},
|
||||
"admin_password": "{{ default .Env.ADMIN_PASSWORD "admin" }}",
|
||||
"developer_mode": {{ default .Env.DEV_MODE "0" }}
|
||||
}
|
||||
94
frappe-templates/nginx.tmpl
Normal file
94
frappe-templates/nginx.tmpl
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
upstream frappe-bench-frappe {
|
||||
server 127.0.0.1:{{ default .Env.WEBSERVER_PORT "8000" }} fail_timeout=0;
|
||||
}
|
||||
|
||||
upstream frappe-bench-socketio-server {
|
||||
server 127.0.0.1:{{ default .Env.SOCKETIO_PORT "9000" }} fail_timeout=0;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name ~^.+$;
|
||||
|
||||
root {{ default .Env.BENCH "/home/frappe/frappe-bench" }}/sites;
|
||||
|
||||
|
||||
add_header X-Frame-Options "SAMEORIGIN";
|
||||
|
||||
location /assets {
|
||||
alias {{ default .Env.BENCH "/home/frappe/frappe-bench" }}/sites/assets/;
|
||||
try_files $uri =404;
|
||||
}
|
||||
|
||||
location ~ ^/protected/(.*) {
|
||||
internal;
|
||||
try_files /{{ default .Env.SITE_NAME "localhost" }}/$1 =404;
|
||||
}
|
||||
|
||||
location /socket.io {
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header X-Frappe-Site-Name {{ default .Env.SITE_NAME "localhost" }};
|
||||
proxy_set_header Origin $scheme://$http_host;
|
||||
proxy_set_header Host $host;
|
||||
|
||||
proxy_pass http://frappe-bench-socketio-server;
|
||||
}
|
||||
|
||||
location / {
|
||||
try_files /{{ default .Env.SITE_NAME "localhost" }}/public/$uri @webserver;
|
||||
}
|
||||
|
||||
location @webserver {
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Frappe-Site-Name {{ default .Env.SITE_NAME "localhost" }};
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Use-X-Accel-Redirect True;
|
||||
proxy_read_timeout 120;
|
||||
proxy_redirect off;
|
||||
|
||||
proxy_pass http://frappe-bench-frappe;
|
||||
}
|
||||
|
||||
# error pages
|
||||
error_page 502 /502.html;
|
||||
location /502.html {
|
||||
root /home/frappe/src/bench/bench/config/templates;
|
||||
internal;
|
||||
}
|
||||
|
||||
# optimizations
|
||||
sendfile on;
|
||||
keepalive_timeout 15;
|
||||
client_max_body_size 50m;
|
||||
client_body_buffer_size 16K;
|
||||
client_header_buffer_size 1k;
|
||||
|
||||
gzip on;
|
||||
gzip_http_version 1.1;
|
||||
gzip_comp_level 5;
|
||||
gzip_min_length 256;
|
||||
gzip_proxied any;
|
||||
gzip_vary on;
|
||||
gzip_types
|
||||
application/atom+xml
|
||||
application/javascript
|
||||
application/json
|
||||
application/rss+xml
|
||||
application/vnd.ms-fontobject
|
||||
application/x-font-ttf
|
||||
application/font-woff
|
||||
application/x-web-app-manifest+json
|
||||
application/xhtml+xml
|
||||
application/xml
|
||||
font/opentype
|
||||
image/svg+xml
|
||||
image/x-icon
|
||||
text/css
|
||||
text/plain
|
||||
text/x-component
|
||||
;
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
web: bench serve --port 8000
|
||||
web: bench serve --port {{ default .Env.WEBSERVER_PORT "8000" }}
|
||||
|
||||
socketio: /usr/bin/node apps/frappe/socketio.js
|
||||
watch: bench watch
|
||||
109
frappe-templates/supervisord.tmpl
Normal file
109
frappe-templates/supervisord.tmpl
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
; Notes:
|
||||
; priority=1 --> Lower priorities indicate programs that start first and shut down last
|
||||
; killasgroup=true --> send kill signal to child processes too
|
||||
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
|
||||
[program:frappe-bench-nginx]
|
||||
command=/usr/sbin/nginx -g "daemon off;"
|
||||
priority=900
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
username=frappe
|
||||
autorestart=true
|
||||
|
||||
[program:frappe-bench-frappe-web]
|
||||
command={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/env/bin/gunicorn -b 127.0.0.1:{{ default .Env.WEBSERVER_PORT "8000" }} -w 4 -t 120 frappe.app:application --preload
|
||||
priority=4
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/web.log
|
||||
stderr_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/web.error.log
|
||||
user=frappe
|
||||
directory={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/sites
|
||||
|
||||
|
||||
[program:frappe-bench-frappe-schedule]
|
||||
command=/usr/local/bin/bench schedule
|
||||
priority=3
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/schedule.log
|
||||
stderr_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/schedule.error.log
|
||||
user=frappe
|
||||
directory={{ default .Env.BENCH "/home/frappe/frappe-bench" }}
|
||||
|
||||
[program:frappe-bench-frappe-default-worker]
|
||||
command=/usr/local/bin/bench worker --queue default
|
||||
priority=4
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/worker.log
|
||||
stderr_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/worker.error.log
|
||||
user=frappe
|
||||
stopwaitsecs=156
|
||||
directory={{ default .Env.BENCH "/home/frappe/frappe-bench" }}
|
||||
killasgroup=true
|
||||
numprocs=1
|
||||
process_name=%(program_name)s-%(process_num)d
|
||||
|
||||
[program:frappe-bench-frappe-short-worker]
|
||||
command=/usr/local/bin/bench worker --queue short
|
||||
priority=4
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/worker.log
|
||||
stderr_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/worker.error.log
|
||||
user=frappe
|
||||
stopwaitsecs=360
|
||||
directory={{ default .Env.BENCH "/home/frappe/frappe-bench" }}
|
||||
killasgroup=true
|
||||
numprocs=1
|
||||
process_name=%(program_name)s-%(process_num)d
|
||||
|
||||
[program:frappe-bench-frappe-long-worker]
|
||||
command=/usr/local/bin/bench worker --queue long
|
||||
priority=4
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/worker.log
|
||||
stderr_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/worker.error.log
|
||||
user=frappe
|
||||
stopwaitsecs=1560
|
||||
directory={{ default .Env.BENCH "/home/frappe/frappe-bench" }}
|
||||
killasgroup=true
|
||||
numprocs=1
|
||||
process_name=%(program_name)s-%(process_num)d
|
||||
|
||||
|
||||
[program:frappe-bench-node-socketio]
|
||||
command=/usr/bin/node {{ default .Env.BENCH "/home/frappe/frappe-bench" }}/apps/frappe/socketio.js
|
||||
priority=4
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/node-socketio.log
|
||||
stderr_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/node-socketio.error.log
|
||||
user=frappe
|
||||
directory={{ default .Env.BENCH "/home/frappe/frappe-bench" }}
|
||||
|
||||
|
||||
[program:frappe-bench-watch]
|
||||
command=/usr/local/bin/bench watch
|
||||
priority=4
|
||||
autostart={{ default .Env.DEV_MODE "false" }}
|
||||
autorestart=true
|
||||
stdout_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/watch.log
|
||||
stderr_logfile={{ default .Env.BENCH "/home/frappe/frappe-bench" }}/logs/watch.error.log
|
||||
user=frappe
|
||||
directory={{ default .Env.BENCH "/home/frappe/frappe-bench" }}
|
||||
|
||||
|
||||
[group:frappe-bench-web]
|
||||
programs=frappe-bench-frappe-web,frappe-bench-node-socketio,frappe-bench-nginx,frappe-bench-watch
|
||||
|
||||
|
||||
[group:frappe-bench-workers]
|
||||
programs=frappe-bench-frappe-schedule,frappe-bench-frappe-default-worker,frappe-bench-frappe-short-worker,frappe-bench-frappe-long-worker
|
||||
3
test.sh
3
test.sh
|
|
@ -6,11 +6,10 @@ docker container ls | grep redis-cache
|
|||
docker container ls | grep redis-queue
|
||||
docker container ls | grep redis-socketio
|
||||
|
||||
cat <(./dbench start) &
|
||||
|
||||
while ! [[ $i == 20 ]]
|
||||
do
|
||||
output=$( curl "http://localhost:8000" )
|
||||
output=$( curl "http://localhost" )
|
||||
{ echo "Exit status of curl: $?"
|
||||
} 1>&2
|
||||
sleep 2
|
||||
|
|
|
|||
Loading…
Reference in a new issue