Merge pull request #436 from frappe/develop

merge improvements to main branch

CONTRIBUTING.md

@@ -32,3 +32,7 @@ Please be considerate when pushing commits and opening PR for multiple branches,
 # Documentation
 
 Place relevant markdown file(s) in the `docs` directory and index them in README.md located at the root of repo.
+
+# Wiki
+
+Add alternatives that can be used optionally along with frappe_docker. Add articles to list on home page as well.

README.md

@@ -35,6 +35,11 @@ It takes care of the following:
 * Setting up all the system requirements: eg. MariaDB, Node, Redis.
 * Configure networking for remote access and setting up LetsEncrypt.
 
+It doesn't take care of the following:
+
+* Cron Job to backup sites is not created by default.
+* Use `CronJob` on k8s or refer wiki for alternatives.
+
 1. Single Server Installs
     1. [Single bench](docs/single-bench.md). Easiest Install!
     2. [Multi bench](docs/multi-bench.md)
@@ -45,6 +50,7 @@ It takes care of the following:
 4. [Environment Variables](docs/environment-variables.md)
 5. [Custom apps for production](docs/custom-apps-for-production.md)
 6. [Tips for moving deployments](docs/tips-for-moving-deployments.md)
+7. [Wiki for optional recipes](https://github.com/frappe/frappe_docker/wiki)
 
 ## Development Setup
 

build/common/commands/new.py

@@ -2,7 +2,6 @@ import os
 import frappe
 import semantic_version
 
-from frappe.commands.site import _new_site
 from frappe.installer import update_site_config
 from constants import COMMON_SITE_CONFIG_FILE, RDS_DB, RDS_PRIVILEGES
 from utils import (
@@ -12,6 +11,16 @@ from utils import (
     get_password,
 )
 
+# try to import _new_site from frappe, which could possibly
+# exist in either commands.py or installer.py, and so we need
+# to maintain compatibility across all frappe versions.
+try:
+    # <= version-{11,12}
+    from frappe.commands.site import _new_site
+except ImportError:
+    # >= version-13 and develop
+    from frappe.installer import _new_site
+
 
 def main():
     config = get_config()

docs/docker-swarm.md

@@ -261,8 +261,8 @@ networks:
 
 Use environment variables:
 
-- `FRAPPE_VERSION` variable to be set to desired version of ERPNext. e.g. 12.10.0
+- `ERPNEXT_VERSION` variable to be set to desired version of ERPNext. e.g. 12.10.0
-- `ERPNEXT_VERSION` variable to be set to desired version of Frappe Framework. e.g. 12.7.0
+- `FRAPPE_VERSION` variable to be set to desired version of Frappe Framework. e.g. 12.7.0
 - `MARIADB_HOST=frappe-mariadb_mariadb-master`
 - `SITES` variable is list of sites in back tick and separated by comma
 ```