From d3e62cc6d8fd7368ef6d9792abb4c8820c4f32a1 Mon Sep 17 00:00:00 2001 From: thespad Date: Wed, 12 Feb 2025 21:20:46 +0000 Subject: [PATCH 1/2] Rebase to 3.21 --- .editorconfig | 0 .github/CONTRIBUTING.md | 0 .github/FUNDING.yml | 0 .github/ISSUE_TEMPLATE/config.yml | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/call_issue_pr_tracker.yml | 0 .github/workflows/call_issues_cron.yml | 0 .github/workflows/external_trigger.yml | 0 .../workflows/external_trigger_scheduler.yml | 0 .github/workflows/greetings.yml | 0 .../workflows/package_trigger_scheduler.yml | 0 .github/workflows/permissions.yml | 0 Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- LICENSE | 0 README.md | 38 ++++++++++++++++++ readme-vars.yml | 40 +++++++++++++++++++ 18 files changed, 80 insertions(+), 2 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/CONTRIBUTING.md mode change 100755 => 100644 .github/FUNDING.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/config.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml mode change 100755 => 100644 .github/workflows/call_issues_cron.yml mode change 100755 => 100644 .github/workflows/external_trigger.yml mode change 100755 => 100644 .github/workflows/external_trigger_scheduler.yml mode change 100755 => 100644 .github/workflows/greetings.yml mode change 100755 => 100644 .github/workflows/package_trigger_scheduler.yml mode change 100755 => 100644 .github/workflows/permissions.yml mode change 100755 => 100644 LICENSE diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 46b883a..66e69fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9446d3c..2477960 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21 # set version label ARG BUILD_DATE diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md index 54339e8..6ce80e1 100644 --- a/README.md +++ b/README.md @@ -67,11 +67,14 @@ This image provides various versions that are available via tags. Please read th | :----: | :----: |--- | | latest | ✅ | Stable Nextcloud releases | | develop | ✅ | Beta Nextcloud pre-releases *only* | +| previous | ✅ | Nextcloud releases from the previous major version | ## Application Setup Access the webui at `https://:443`, for more information check out [Nextcloud](https://nextcloud.com/). +Note: `occ` should be run without prepending with `sudo -u abc php` or `sudo -u www-data php` ie; `docker exec -it nextcloud occ maintenance:mode --off` + ### Updating Nextcloud Updating Nextcloud is done by pulling the new image, and recreating the container with it. @@ -86,6 +89,34 @@ Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffi If (auto) installed, those built-in packages may cause instability and should be removed. +### HEIC Image Previews + +In order to enable HEIC image preview generation you will need to add the following to your `config.php` file in your `config/www/nextcloud/config' directory; + +``` + 'enable_previews' => true, + 'enabledPreviewProviders' => + array ( + 'OC\Preview\PNG', + 'OC\Preview\JPEG', + 'OC\Preview\GIF', + 'OC\Preview\BMP', + 'OC\Preview\XBitmap', + 'OC\Preview\MP3', + 'OC\Preview\TXT', + 'OC\Preview\MarkDown', + 'OC\Preview\OpenDocument', + 'OC\Preview\Krita', + 'OC\Preview\HEIC', + ), +``` + +You may need to log out and back in for the changes to come in to effect. + +This fix was sourced from [Nextcloud Documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#enabledpreviewproviders) + +Nextcloud state that HEIC preview is disabled by default due to performance or privacy concerns, so enable this at your own risk. + ### Custom App Directories If you are [using custom app directories](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories) you will need to make the custom folder(s) you are using available to the web server. The recommended way to do this with our container is to add a volume. Ex: @@ -319,8 +350,15 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **12.02.25:** - Rebase to Alpine 3.21. * **09.01.25:** - Fix uploading large files. Existing users should update their nginx confs. +* **09.07.24:** - Add `previous` tag for n-1 releases. * **24.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. +* **19.05.24:** - Added util-linux package required for taskset. +* **10.04.24:** - Added imagemagick-pdf. +* **05.04.24:** - Added imagemagick-heic. Manual update to `config.php` required - see above. +* **02.04.24:** - Existing users should update: site-confs/default.conf - Add support for the Client Push (notify_push) plugin and the [new mod](https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push). +* **22.03.24:** - Add imagemagick-svg module. * **06.03.24:** - Rebase to Alpine 3.19 with php 8.3. * **02.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **22.12.23:** - Site default conf updating to include mime.types for js and mjs and update location to include more file types. diff --git a/readme-vars.yml b/readme-vars.yml index 8da9a3b..2f350ca 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -18,6 +18,7 @@ development_versions: true development_versions_items: - {tag: "latest", desc: "Stable Nextcloud releases"} - {tag: "develop", desc: "Beta Nextcloud pre-releases *only*"} + - {tag: "previous", desc: "Nextcloud releases from the previous major version"} # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" @@ -28,11 +29,15 @@ param_volumes: param_usage_include_ports: true param_ports: - {external_port: "443", internal_port: "443", port_desc: "WebUI"} +readonly_supported: false +nonroot_supported: false # application setup block app_setup_block_enabled: true app_setup_block: | Access the webui at `https://:443`, for more information check out [Nextcloud]({{ project_url }}). + Note: `occ` should be run without prepending with `sudo -u abc php` or `sudo -u www-data php` ie; `docker exec -it nextcloud occ maintenance:mode --off` + ### Updating Nextcloud Updating Nextcloud is done by pulling the new image, and recreating the container with it. @@ -47,6 +52,34 @@ app_setup_block: | If (auto) installed, those built-in packages may cause instability and should be removed. + ### HEIC Image Previews + + In order to enable HEIC image preview generation you will need to add the following to your `config.php` file in your `config/www/nextcloud/config' directory; + + ``` + 'enable_previews' => true, + 'enabledPreviewProviders' => + array ( + 'OC\Preview\PNG', + 'OC\Preview\JPEG', + 'OC\Preview\GIF', + 'OC\Preview\BMP', + 'OC\Preview\XBitmap', + 'OC\Preview\MP3', + 'OC\Preview\TXT', + 'OC\Preview\MarkDown', + 'OC\Preview\OpenDocument', + 'OC\Preview\Krita', + 'OC\Preview\HEIC', + ), + ``` + + You may need to log out and back in for the changes to come in to effect. + + This fix was sourced from [Nextcloud Documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#enabledpreviewproviders) + + Nextcloud state that HEIC preview is disabled by default due to performance or privacy concerns, so enable this at your own risk. + ### Custom App Directories If you are [using custom app directories](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories) you will need to make the custom folder(s) you are using available to the web server. The recommended way to do this with our container is to add a volume. Ex: @@ -114,8 +147,15 @@ init_diagram: | "nextcloud:develop" <- Base Images # changelog changelogs: + - {date: "12.02.25:", desc: "Rebase to Alpine 3.21."} - {date: "09.01.25:", desc: "Fix uploading large files. Existing users should update their nginx confs."} + - {date: "09.07.24:", desc: "Add `previous` tag for n-1 releases."} - {date: "24.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} + - {date: "19.05.24:", desc: "Added util-linux package required for taskset."} + - {date: "10.04.24:", desc: "Added imagemagick-pdf."} + - {date: "05.04.24:", desc: "Added imagemagick-heic. Manual update to `config.php` required - see above."} + - {date: "02.04.24:", desc: "Existing users should update: site-confs/default.conf - Add support for the Client Push (notify_push) plugin and the [new mod](https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push)."} + - {date: "22.03.24:", desc: "Add imagemagick-svg module."} - {date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."} - {date: "02.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."} - {date: "22.12.23:", desc: "Site default conf updating to include mime.types for js and mjs and update location to include more file types."} From 16844327e3cc59982d281e81e6ad05ab798bde30 Mon Sep 17 00:00:00 2001 From: thespad Date: Wed, 12 Feb 2025 21:32:56 +0000 Subject: [PATCH 2/2] Fix migration permissions --- root/migrations/02-default-location | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/migrations/02-default-location diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location old mode 100644 new mode 100755