diff --git a/docs/02-setup/02-build-setup.md b/docs/02-setup/02-build-setup.md index d411cab7..d0e6907b 100644 --- a/docs/02-setup/02-build-setup.md +++ b/docs/02-setup/02-build-setup.md @@ -74,20 +74,20 @@ podman build \ ## Build args -| Arg | Purpose | -| -------------------- | --------------------------------------------------------------------------------------------- | -| **Frappe Framework** | | -| FRAPPE_PATH | Repository URL for Frappe framework source code. Defaults to https://github.com/frappe/frappe | -| FRAPPE_BRANCH | Branch to use for Frappe framework. Defaults to version-15 | -| **Custom Apps** | | -| (secret) apps_json | Passed via `--secret=id=apps_json,src=apps.json`. Never use `--build-arg` for this file. | -| **Dependencies** | | -| PYTHON_VERSION | Python version for the base image | -| NODE_VERSION | Node.js version | -| WKHTMLTOPDF_VERSION | wkhtmltopdf version | -| **bench only** | | -| DEBIAN_BASE | Debian base version for the bench image, defaults to `bookworm` | -| WKHTMLTOPDF_DISTRO | use the specified distro for debian package. Default is `bookworm` | +| Arg | Purpose | +| -------------------- | ----------------------------------------------------------------------------------------------- | +| **Frappe Framework** | | +| FRAPPE_PATH | Repository URL for Frappe framework source code. Defaults to | +| FRAPPE_BRANCH | Branch to use for Frappe framework. Defaults to version-15 | +| **Custom Apps** | | +| (secret) apps_json | Passed via `--secret=id=apps_json,src=apps.json`. Never use `--build-arg` for this file. | +| **Dependencies** | | +| PYTHON_VERSION | Python version for the base image | +| NODE_VERSION | Node.js version | +| WKHTMLTOPDF_VERSION | wkhtmltopdf version | +| **bench only** | | +| DEBIAN_BASE | Debian base version for the bench image, defaults to `bookworm` | +| WKHTMLTOPDF_DISTRO | use the specified distro for debian package. Default is `bookworm` | # env file diff --git a/docs/06-migration/01-migrate-from-multi-image-setup.md b/docs/06-migration/01-migrate-from-multi-image-setup.md index 0fd2e344..04d8a2c1 100644 --- a/docs/06-migration/01-migrate-from-multi-image-setup.md +++ b/docs/06-migration/01-migrate-from-multi-image-setup.md @@ -114,3 +114,14 @@ create-site: # ... removed for brevity ``` + +## Upgrading from images with a nested sites/assets volume + +Previous images declared `VOLUME /home/frappe/frappe-bench/sites/assets` separately. This created an implicit nested mountpoint inside the `sites` volume, which could cause Docker to attach different anonymous volumes per container in multi-container setups. +That declaration has been removed. `sites` is now the single shared mount, consistent with the compose setup and docs. + +**After pulling the updated image:** + +- Recreate all containers (`docker compose up --force-recreate`). Without this, Docker may keep the old anonymous `sites/assets` volume + attached from before the change. +- No `bench build` is needed — this only fixes mount consistency, not the asset workflow. diff --git a/images/custom/Containerfile b/images/custom/Containerfile index c7519e84..e0c5b335 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -144,7 +144,6 @@ WORKDIR /home/frappe/frappe-bench VOLUME [ \ "/home/frappe/frappe-bench/sites", \ - "/home/frappe/frappe-bench/sites/assets", \ "/home/frappe/frappe-bench/logs" \ ] diff --git a/images/layered/Containerfile b/images/layered/Containerfile index de5e835d..02bf9a20 100644 --- a/images/layered/Containerfile +++ b/images/layered/Containerfile @@ -34,7 +34,6 @@ WORKDIR /home/frappe/frappe-bench VOLUME [ \ "/home/frappe/frappe-bench/sites", \ - "/home/frappe/frappe-bench/sites/assets", \ "/home/frappe/frappe-bench/logs" \ ] diff --git a/images/production/Containerfile b/images/production/Containerfile index 17f1573d..4dfb8685 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -137,7 +137,6 @@ WORKDIR /home/frappe/frappe-bench VOLUME [ \ "/home/frappe/frappe-bench/sites", \ - "/home/frappe/frappe-bench/sites/assets", \ "/home/frappe/frappe-bench/logs" \ ]