mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-17 05:45:09 +00:00
Merge pull request #1879 from ews-pgasser/fix/remove-nested-sites-assets-volume
Fix/remove nested sites assets volume
This commit is contained in:
commit
28dbfd57ba
5 changed files with 25 additions and 17 deletions
|
|
@ -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 <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` |
|
||||
|
||||
# env file
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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" \
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -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" \
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -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" \
|
||||
]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue