From fd6f811978c597d8fc0eb1925fc1d296641ad28e Mon Sep 17 00:00:00 2001 From: Josh Richards Date: Thu, 28 Dec 2023 10:08:35 -0500 Subject: [PATCH 1/2] enh(README) Persistent volume upgrade.exclude clarification - Make the warning more prominent - Clarify the language - Clarity trade-offs Fixes: #2132 Signed-off-by: Josh Richards --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a4592d70..3a85604c 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,8 @@ $ docker run -d \ mariadb:10.6 ``` +### Additional volumes + If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps. The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder. Overview of the folders that can be mounted as volumes: @@ -91,10 +93,16 @@ $ docker run -d \ -v theme:/var/www/html/themes/ \ nextcloud ``` -If mounting additional volumes, you should note that data inside the main folder (`/var/www/html`) may be removed during installation and upgrades, unless listed in [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude). You should consider: + +### Custom volumes + +If mounting additional volumes under `/var/www/html`, you should consider: - Confirming that [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude) contains the files and folders that should persist during installation and upgrades; or - Mounting storage volumes to locations outside of `/var/www/html`. +> [!WARNING] +> You should note that data inside the main folder (`/var/www/html`) will be removed during installation and upgrades, unless listed in [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude). The additional volumes officially supported are already in that list, but custom volumes will need to be added by you. We suggest mounting custom storage volumes outside of `/var/www/html` so that making this adjustment is unnecessary. If you must do so, however, you may build a custom image with a modified `/upgrade.exclude` file that incorporates your custom volume(s). + ## Using the Nextcloud command-line interface To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command): From accf5bf119b39b1a38d073e9e13e83b119c06e81 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 12 Jan 2024 15:12:03 -0500 Subject: [PATCH 2/2] Update README.md Co-authored-by: J0WI Signed-off-by: Josh --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a85604c..2bb6de38 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ If mounting additional volumes under `/var/www/html`, you should consider: - Mounting storage volumes to locations outside of `/var/www/html`. > [!WARNING] -> You should note that data inside the main folder (`/var/www/html`) will be removed during installation and upgrades, unless listed in [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude). The additional volumes officially supported are already in that list, but custom volumes will need to be added by you. We suggest mounting custom storage volumes outside of `/var/www/html` so that making this adjustment is unnecessary. If you must do so, however, you may build a custom image with a modified `/upgrade.exclude` file that incorporates your custom volume(s). +> You should note that data inside the main folder (`/var/www/html`) will be overridden/removed during installation and upgrades, unless listed in [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude). The additional volumes officially supported are already in that list, but custom volumes will need to be added by you. We suggest mounting custom storage volumes outside of `/var/www/html` and if possible read-only so that making this adjustment is unnecessary. If you must do so, however, you may build a custom image with a modified `/upgrade.exclude` file that incorporates your custom volume(s). ## Using the Nextcloud command-line interface