2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-25 19:21:09 +00:00
Commit Graph

485 Commits

Author SHA1 Message Date
Revant Nandgaonkar
df0d9947b0
Merge pull request #274 from Thunderbottom/helm-release
build: auto release helm on docker update [ci skip]
2020-06-18 19:40:49 +05:30
Chinmay D. Pai
d8da5e3ae7
build: auto release helm on docker update [ci skip]
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-18 19:02:39 +05:30
Revant Nandgaonkar
3ce4fff974
Merge pull request #272 from muniter/nginx_template
fix: use remote_addr instead of header ip
2020-06-18 04:54:05 +05:30
Javier López
4e26ca653c fix: use remote_addr instead of header ip 2020-06-17 14:37:38 -05:00
Revant Nandgaonkar
fb46aae2c0 ci: trigger build 2020-06-17 15:15:56 +05:30
Revant Nandgaonkar
d771dc3bd5
Merge pull request #269 from revant/feat-helm-chart-release
ci: helm chart release
2020-06-17 15:14:43 +05:30
Revant Nandgaonkar
1360000da8 ci: helm chart release 2020-06-17 15:11:24 +05:30
Revant Nandgaonkar
4b0fa201bb
Merge pull request #267 from frappe/master
chore: sync master and develop
2020-06-17 13:32:49 +05:30
Chinmay D. Pai
3e7969419f
chore: update deploy_key for travis
mess up mess up mess up mess up mess up

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-17 10:31:18 +05:30
Chinmay D. Pai
a238c65603
chore: add deploy_key for helm travis
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-17 09:48:21 +05:30
Revant Nandgaonkar
a3ac8ac675
Merge pull request #263 from revant/fix-readme-contribution-url
fix: README contributions url
2020-06-14 21:26:15 +05:30
Revant Nandgaonkar
f2d61450fe fix: README contributions url
[skip travis]
2020-06-14 21:24:50 +05:30
Revant Nandgaonkar
f760ec741d
Merge pull request #262 from muniter/doc-additions
Doc additions and minor fixes
2020-06-14 06:08:52 +05:30
Revant Nandgaonkar
227a08dc8d docs: explain single-bench labels
explain environment variables set in labels
[skip travis]
2020-06-14 05:52:52 +05:30
Revant Nandgaonkar
1b942753ee feat: dynamic labels for local or production
use environment variables to set labels
[skip travis]
2020-06-14 05:45:14 +05:30
Javier López
eb2dcb7f8e Fix: Quotes are needed here 2020-06-13 16:03:02 -05:00
Javier López
83d42a8a32 Feat: Documentation for variables, and notes about initialization [skip
travis]
2020-06-13 11:49:32 -05:00
Javier López
028f7524b8 Feat: How to HTTP > HTTPS redirection with traefik [skip travis] 2020-06-13 11:25:05 -05:00
Javier López
80cad7417b fix: Remove quotes to match other services [skip travis] 2020-06-13 11:15:55 -05:00
Revant Nandgaonkar
9651dbb635
Merge pull request #258 from revant/develop
feat: easy install
2020-06-13 15:50:13 +05:30
Revant Nandgaonkar
e06c30a0ee docs: explain SITE_NAME
[skip travis]
2020-06-13 15:47:31 +05:30
Revant Nandgaonkar
6a83a9d8cc docs: organize fix links
[skip travis]
2020-06-13 15:40:47 +05:30
Revant Nandgaonkar
38be99fc5e docs: organize docs
break down readme into multiple files
organize in docs directory
[skip travis]
2020-06-13 15:33:06 +05:30
Revant Nandgaonkar
0489fae441
Merge pull request #260 from frappe/develop
Release Frappe Framework v12.6.2 and ERPNext v12.9.4
2020-06-13 00:15:17 +05:30
Revant Nandgaonkar
9756c03ec7
Merge pull request #259 from revant/feat-wait-before-new
feat: wait for connection before creating site
2020-06-12 23:46:49 +05:30
Revant Nandgaonkar
00541810d9 fix: env example files
do not use variable to set other variable
[skip travis]
2020-06-12 23:19:03 +05:30
Revant Nandgaonkar
c618bd86d9 feat: wait for connection before creating site 2020-06-12 23:12:52 +05:30
Revant Nandgaonkar
59a390b772 feat: easy install 2020-06-12 22:19:37 +05:30
Revant Nandgaonkar
da4f866543
Merge pull request #256 from revant/improve-devcontainer
feat(frappe/bench): allow 5 benches
2020-06-11 13:44:59 +05:30
Revant Nandgaonkar
306d7e73da feat(frappe/bench): delete devcontainer Dockerfile
Delete additional Dockerfile from .devcontainer
[skip travis]
2020-06-11 13:43:27 +05:30
Revant Nandgaonkar
daef926b06 feat(frappe/bench): allow 5 benches 2020-06-11 12:55:27 +05:30
Revant Nandgaonkar
afd9dc560f
Merge pull request #254 from africlouds/develop
Multibench support in devel environment
2020-06-10 22:33:29 +05:30
africlouds
8ca5879211
Updated build images commands
Before starting the images, build the frappe images
2020-06-10 09:30:57 +02:00
africlouds
84bf55860a
Updated Docs for multi bench 2020-06-10 09:28:38 +02:00
africlouds
aa8e7d374c
Build frappe with Dockerfile
- Build frappe image using development Dockerfile instead of bench:latest image
- Exposing port range
2020-06-10 09:22:47 +02:00
africlouds
450e1b64aa
Added Dockerfile for dev env
Exposing port range 8000-8005 and 9000-9005. The Dockerfile allows easy extending the upstream bench image for development purpose
2020-06-10 09:19:23 +02:00
Revant Nandgaonkar
3da4e0444b
Merge pull request #252 from africlouds/develop
Set /workspace/development as default working dir
2020-06-10 09:49:32 +05:30
africlouds
a5b8db6137
Set /workspace/development as default working dir
When one misses the part of the doc that says bench should be created under /workspace/development, bench is created in home directory and the work would be lost when the container is recreated. Making the directory default would avert that
2020-06-09 07:33:20 +02:00
Revant Nandgaonkar
266806ff73
Merge pull request #249 from samridhprasad/patch-1
Updated VSCode Remote Containers extension
2020-06-06 23:45:41 +05:30
Sam Prasad
945a9e3979
Updated VSCode Remote Containers extension
As I was going through the installation process, I noticed the steps for VSCode Remote Containers were a little unclear.
I also a fixed a typo in Line 14
2020-05-31 20:02:55 -04:00
Revant Nandgaonkar
e8970ad663
Merge pull request #247 from frappe/develop
build: erpnext v12.9.3
2020-05-26 20:28:27 +05:30
Chinmay Pai
2eecd1311d
Merge pull request #246 from revant/feat-debug-workers 2020-05-24 10:36:56 +05:30
Revant Nandgaonkar
ed03259c17 feat: debug workers in vscode devcontainers
[skip travis]
2020-05-24 05:34:28 +05:30
Chinmay Pai
122bdaccb5
Merge pull request #245 from frappe/develop 2020-05-22 16:23:29 +05:30
Revant Nandgaonkar
4cdec4d47d
Merge pull request #243 from msimmer/fix-readme-link
Updates README
2020-05-22 15:37:04 +05:30
Revant Nandgaonkar
c27a066234
Merge pull request #244 from revant/restore-latest-backup
fix: only download and restore latest backup
2020-05-22 15:36:50 +05:30
Revant Nandgaonkar
93c1dc50d5 fix: only download and restore latest backup 2020-05-22 15:15:33 +05:30
Maxwell Simmer
2689aa8d06 Updates README 2020-05-22 11:30:29 +02:00
Revant Nandgaonkar
bf56f90a08
Merge pull request #241 from frappe/develop
ERPNext v12.9.0 and Frappe v12.6.0
2020-05-21 21:35:36 +05:30
Revant Nandgaonkar
15c6c6cd38
Merge pull request #240 from revant/buster-whktmltopdf
update: use wkhtmltopdf for buster_amd64
2020-05-19 12:35:15 +05:30