diff --git a/README.md b/README.md index 836be31..4f73e19 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ this kit: | nextcloud-azure-aks | Kubernetes Version Compatibility* | Nextcloud Version | Deployment Mechanism | |---------------------|-----------------------------------|-------------------|-----------------------------| +| 13.x | Only tested on 1.25+ | 26.x | Kustomize and Rigger CLI | | 12.x | Only tested on 1.25+ | 25.x | Kustomize and Rigger CLI | | 11.x | Only tested on 1.25+ | 24.x | Kustomize and Rigger CLI | | 10.x | 1.16-1.22+ | 23.x | Kustomize and Rigger CLI | diff --git a/SECURITY.md b/SECURITY.md index deaccf3..0d1115c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,8 +3,8 @@ ## Supported Versions | Version | Supported | |---------| ------------------ | -| 11.x | :white_check_mark: | -| < 11.0 | :x: | +| 13.x | :white_check_mark: | +| < 13.0 | :x: | ## Reporting a Vulnerability Please do not report vulnerabilities using the issue queue. Instead, please diff --git a/docker/backend-nextcloud-apache/Dockerfile b/docker/backend-nextcloud-apache/Dockerfile index 959d965..b2595ff 100644 --- a/docker/backend-nextcloud-apache/Dockerfile +++ b/docker/backend-nextcloud-apache/Dockerfile @@ -8,7 +8,7 @@ # @copyright Copyright (c) 2019-2024, Inveniem # @license GNU AGPL version 3 or any later version # -FROM nextcloud:25.0.13-apache +FROM nextcloud:26.0.13-apache ENV NEXTCLOUD_CONFIG_READ_ONLY "false" ENV NEXTCLOUD_INIT_LOCK "true" diff --git a/docker/backend-nextcloud-fpm/Dockerfile b/docker/backend-nextcloud-fpm/Dockerfile index 26e05ac..a3f378e 100644 --- a/docker/backend-nextcloud-fpm/Dockerfile +++ b/docker/backend-nextcloud-fpm/Dockerfile @@ -17,9 +17,9 @@ # Patch Alpine musl to work around this issue: # https://gitlab.alpinelinux.org/alpine/aports/issues/10960 # -FROM alpine:3.16 as musl_compile +FROM alpine:3.19 as musl_compile -ENV MUSL_VERSION="1.2.3" +ENV MUSL_VERSION="1.2.4" RUN set -eux;\ apk add --update \ @@ -59,7 +59,7 @@ RUN set -eux;\ ################################################################################ # This is the container that actually gets pushed. # -FROM nextcloud:25.0.13-fpm-alpine +FROM nextcloud:26.0.13-fpm-alpine ENV NEXTCLOUD_CONFIG_READ_ONLY "false" ENV NEXTCLOUD_INIT_LOCK "true" diff --git a/docker/nextcloud-common/entrypoint.sh b/docker/nextcloud-common/entrypoint.sh index f12a6a0..677eded 100755 --- a/docker/nextcloud-common/entrypoint.sh +++ b/docker/nextcloud-common/entrypoint.sh @@ -211,7 +211,7 @@ invoke_hooks_for_stage() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -print | \ + find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | \ sort | \ while read -r script_file_path; do if ! [ -x "${script_file_path}" ]; then @@ -318,10 +318,10 @@ deploy_nextcloud_release() { # We explicitly force updates to custom apps and themes from this Docker # image. if [ ! -d "${dir_path}" ] || directory_empty "${dir_path}" || - [ "${dir_path}" = "custom_apps" ] || [ "${dir_path}" = "themes" ]; then + [ "${dir}" = "custom_apps" ] || [ "${dir}" = "themes" ]; then mkdir -p "${dir_path}" - chmod 0750 "${dir_path}" - chown "root:${group}" "${dir_path}" + chmod 0755 -R "${dir_path}" + chown "root:${group}" -R "${dir_path}" # Avoid accidentally bashing data in the data folder. if [ "${dir}" = "data" ]; then diff --git a/docker/nextcloud-cron/Dockerfile b/docker/nextcloud-cron/Dockerfile index ba5bfcb..d4c2789 100644 --- a/docker/nextcloud-cron/Dockerfile +++ b/docker/nextcloud-cron/Dockerfile @@ -7,7 +7,7 @@ # @copyright Copyright (c) 2019-2024, Inveniem # @license GNU AGPL version 3 or any later version # -FROM nextcloud:25.0.13-apache +FROM nextcloud:26.0.13-apache ENV NEXTCLOUD_CONFIG_READ_ONLY "true" diff --git a/overlays/00-sample/publish.profile b/overlays/00-sample/publish.profile index 313bf03..5d4c3f0 100644 --- a/overlays/00-sample/publish.profile +++ b/overlays/00-sample/publish.profile @@ -39,14 +39,14 @@ CONTAINER_ENGINE="docker" # NEXTCLOUD_CUSTOM_APPS=( 'https://github.com/westberliner/checksum/releases/download/v1.2.3/checksum.tar.gz' - 'https://github.com/nextcloud-releases/files_antivirus/releases/download/v5.4.2/files_antivirus-v5.4.2.tar.gz' - 'https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v1.15.3/files_automatedtagging-v1.15.3.tar.gz' + 'https://github.com/nextcloud-releases/files_antivirus/releases/download/v5.5.0/files_antivirus-v5.5.0.tar.gz' + 'https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v1.16.1/files_automatedtagging-v1.16.1.tar.gz' 'https://github.com/nextcloud-releases/files_downloadactivity/releases/download/v1.16.0/files_downloadactivity-v1.16.0.tar.gz' 'https://github.com/Inveniem/nextcloud-files-excludedirs/releases/download/v1.0.1-beta/nextcloud_files_excludedirs-v1.0.1-beta.tar.gz' 'https://github.com/nextcloud/files_rightclick/releases/download/v0.15.1/files_rightclick.tar.gz' 'https://github.com/gino0631/nextcloud-metadata/releases/download/v0.19.0/metadata.tar.gz' 'https://github.com/owncloud/music/releases/download/v1.10.0/music_1.10.0_for_nextcloud.tar.gz' - 'https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.3.0/previewgenerator-v5.3.0.tar.gz' + 'https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz' 'https://github.com/nextcloud-releases/user_external/releases/download/v3.2.0/user_external-v3.2.0.tar.gz' 'https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.7/user_saml-v5.2.7.tar.gz' )