diff --git a/docs/development.md b/docs/development.md index 476314a4..19060abb 100644 --- a/docs/development.md +++ b/docs/development.md @@ -204,7 +204,7 @@ bench get-app --branch version-12 https://github.com/myusername/myapp bench --site mysite.localhost install-app myapp ``` -At the time of this writing, the Payments app has been factored out of the Version 14 ERPNext app and is now a separate app. ERPNext will not install without it, however, so we need to specify `--resolve-deps` command line switch to install it. +At the time of this writing, the Payments app has been factored out of the Version 14 ERPNext app and is now a separate app. ERPNext will not install it. ```shell bench get-app --branch version-14 --resolve-deps erpnext diff --git a/overrides/compose.mariadb-shared.yaml b/overrides/compose.mariadb-shared.yaml index 29e7404b..13bfc656 100644 --- a/overrides/compose.mariadb-shared.yaml +++ b/overrides/compose.mariadb-shared.yaml @@ -17,7 +17,7 @@ services: environment: MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit} volumes: - - ${HOME}/data/mariadb:/var/lib/mysql + - db-data:/var/lib/mysql networks: - mariadb-network @@ -25,3 +25,6 @@ networks: mariadb-network: name: mariadb-network external: false + +volumes: + db-data: diff --git a/overrides/compose.traefik-ssl.yaml b/overrides/compose.traefik-ssl.yaml index 6a31998f..0c0a9b84 100644 --- a/overrides/compose.traefik-ssl.yaml +++ b/overrides/compose.traefik-ssl.yaml @@ -42,4 +42,7 @@ services: ports: - 443:443 volumes: - - ${HOME}/data/traefik/certificates:/certificates + - cert-data:/certificates + +volumes: + cert-data: diff --git a/tests/conftest.py b/tests/conftest.py index 5c4e3d75..015c5e78 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -89,12 +89,6 @@ def erpnext_site(compose: Compose): "erpnext", site_name, ] - erpnext_version = os.environ.get("ERPNEXT_VERSION") - if erpnext_version in [ - "develop", - "version-14", - ] or erpnext_version.startswith("v14"): - args.append("--install-app=payments") compose.bench(*args) compose("restart", "backend") yield site_name