2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-25 03:16:02 +00:00
Commit Graph

778 Commits

Author SHA1 Message Date
Davide Bortolami
922877bf92 Fixes #101
Nginx will now wait up to 10 seconds for frappe-python and frappe-socketio to be available
2020-03-04 14:15:25 +00:00
Chinmay Pai
e3cd90bda2
Merge pull request #107 from revant/fix-worker-images
fix worker images
2020-03-04 16:13:39 +05:30
Revant Nandgaonkar
501d144728 fix: worker images new site command
install apps is a list not boolean
2020-03-04 14:36:13 +05:30
chabad360
8eb26446da make this pr not make travis build on the wrong image 2020-03-04 03:59:53 +00:00
chabad360
48a305bec6 Adding in the rsync for the docker-entrypoint 2020-03-04 03:43:49 +00:00
chabad360
f4e24e15a8 create install_app for assets 2020-03-04 03:33:38 +00:00
chabad360
b610caba7e forgot about branches 2020-03-04 03:33:23 +00:00
chabad360
177ca58af6 add and implement install_app for worker image 2020-03-04 02:52:36 +00:00
chabad360
34d97848b5 remove some debugging lines 2020-03-04 02:22:29 +00:00
chabad360
8c00873065 swap out travis.sh for python and be compat with #100 2020-03-04 02:15:59 +00:00
Davide Bortolami
6f7a9b92ac Refactor renaming erpnext-assets and frappe-assets to erpnext-nginx and frappe-nginx 2020-03-03 23:40:11 +00:00
chabad360
77aca4d3cc organize travis.yml a bit 2020-03-03 06:04:17 +00:00
chabad360
37eabd9018 add a help file and alphabetize 2020-03-03 05:56:14 +00:00
chabad360
ca715e3e5c add versioning support to travis.sh 2020-03-03 05:27:18 +00:00
chabad360
84d53bfcba convert edge build to travis.sh 2020-03-03 05:03:13 +00:00
Chinmay D. Pai
c21d26fa36
chore: remove redundant docker-compose
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-02 23:47:13 +05:30
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