2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-23 18:48:58 +00:00
Commit Graph

454 Commits

Author SHA1 Message Date
Revant Nandgaonkar
18e8f05c9f fix: erpnext image build errors 2020-06-28 00:22:23 +05:30
Revant Nandgaonkar
7106124a07 refactor: reuse Dockerfile(s) 2020-06-27 23:44:13 +05:30
Revant Nandgaonkar
64c0517665
Merge pull request #286 from Thunderbottom/restore-site_config
fix: restore encryption key on site restore
2020-06-26 11:00:13 +05:30
Revant Nandgaonkar
f77ca7726c test: fix cgo errors before building 2020-06-26 10:19:27 +05:30
Revant Nandgaonkar
8beb6a284f test: add tests
overwrite restore
check index pages of created sites
improve formatting
2020-06-26 06:06:28 +05:30
Revant Nandgaonkar
1a1636df55 fix: fresh restore site_config backup 2020-06-26 05:47:17 +05:30
Chinmay D. Pai
95416ee555
fix: check for all possible site config backups
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-25 23:42:55 +05:30
Chinmay D. Pai
bdbcf40702
fix: restore encryption key on site restore
if encryption key exists for a site, it will now be restored to the site
config while restoring site

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-25 23:27:35 +05:30
Revant Nandgaonkar
a42c0d1f40
Merge pull request #285 from revant/try-pwd
test: play with docker
2020-06-25 22:06:46 +05:30
Revant Nandgaonkar
7bb49f081d test: play with docker
[skip travis]
2020-06-25 22:04:52 +05:30
Revant Nandgaonkar
c30ddf7917
Merge pull request #284 from revant/fix-site-config-backup
refactor: backup site_config.json
2020-06-25 19:49:44 +05:30
Revant Nandgaonkar
af5854fc33 refactor: backup site_config.json
closes #282
2020-06-25 18:57:25 +05:30
Chinmay Pai
d0fc8258ce
Merge pull request #279 from revant/fix-migrate
fix: migrate command
2020-06-21 13:47:28 +05:30
Revant Nandgaonkar
eac54ebe00 fix: migrate command
importing migrate() needs frappe.init
2020-06-21 13:23:22 +05:30
Chinmay Pai
bce3321df8
Merge pull request #277 from revant/fix-helm-release 2020-06-19 22:28:31 +05:30
Revant Nandgaonkar
6c229c6814 feat: add latest tag for edge images 2020-06-19 21:57:56 +05:30
Revant Nandgaonkar
442d840319 fix: travis helm chart release 2020-06-19 21:39:28 +05:30
Revant Nandgaonkar
90556e75bc
Merge pull request #276 from africlouds/develop
Install less in bench Dockerfile
2020-06-19 20:09:00 +05:30
africlouds
d17ea1366a
Install less in bench Dockerfile
Without less install, tools like bench --site site_name mariadb are not displaying results
2020-06-19 07:44:02 +02:00
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