Merge pull request #7029 from masterwoot/patch-1

borgbackup: fix typo in backupscript.sh
Merge pull request #7032 from winterrific/main
2026-02-15 02:00:15 +00:00 · 2025-10-31 15:36:17 +01:00 · 2025-10-31 15:35:49 +01:00 · 2025-10-31 15:30:44 +01:00 · 2025-10-31 15:30:21 +01:00 · 2025-10-31 15:29:34 +01:00
7 changed files with 31 additions and 30 deletions
--- a/Containers/borgbackup/backupscript.sh
+++ b/Containers/borgbackup/backupscript.sh
@ -199,7 +199,7 @@ if [ "$BORG_MODE" = backup ]; then
    if [ -f "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/.noaiobackup" ]; then
        BORG_EXCLUDE+=(--exclude "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/")
        BORG_INCLUDE+=(--pattern="+/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/.noaiobackup")
-        echo "⚠️⚠️⚠️ '.noaiobackup' file was found in Nextclouds data directory. Excluding the data directory from backup!"
+        echo "⚠️⚠️⚠️ '.noaiobackup' file was found in Nextcloud's data directory. Excluding the data directory from backup!"
    # Exclude preview folder if .noaiobackup file was found
    elif [ -f /nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/appdata_*/preview/.noaiobackup ]; then
        BORG_EXCLUDE+=(--exclude "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/appdata_*/preview/")
@ -344,7 +344,7 @@ if [ "$BORG_MODE" = restore ]; then
        ADDITIONAL_RSYNC_EXCLUDES=(--exclude "nextcloud_aio_nextcloud_data/**")
        ADDITIONAL_BORG_EXCLUDES=(--exclude "sh:nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/**")
        ADDITIONAL_FIND_EXCLUDES=(-o -regex 'nextcloud_aio_volumes/nextcloud_aio_nextcloud_data\(/.*\)?')
-        echo "⚠️⚠️⚠️ '.noaiobackup' file was found in Nextclouds data directory. Excluding the data directory from restore!"
+        echo "⚠️⚠️⚠️ '.noaiobackup' file was found in Nextcloud's data directory. Excluding the data directory from restore!"
        echo "You might run into problems due to this afterwards as potentially this makes the directory go out of sync with the database."
        echo "You might be able to fix this by running 'occ files:scan --all' and 'occ maintenance:repair' and 'occ files:scan-app-data' after the restore."
        echo "See https://github.com/nextcloud/all-in-one#how-to-run-occ-commands"
--- a/Containers/clamav/Dockerfile
+++ b/Containers/clamav/Dockerfile
@ -17,6 +17,7 @@ RUN set -ex; \
    sed -i "s|Example| |g" /etc/clamav/clamav-milter.conf; \
    sed -i "s|#\?MilterSocket inet:7357|MilterSocket inet:7357|g" /etc/clamav/clamav-milter.conf; \
    sed -i "s|#\?ClamdSocket unix:/run/clamav/clamd.sock|ClamdSocket unix:/tmp/clamd.sock|g" /etc/clamav/clamav-milter.conf; \
+    sed -i "s|#\?OnInfected Quarantine|OnInfected Reject|g" /etc/clamav/clamav-milter.conf; \
    sed -i "s|#\?AddHeader Replace|AddHeader Add|g" /etc/clamav/clamav-milter.conf; \
    sed -i "s|#\?Foreground yes|Foreground yes|g" /etc/clamav/clamav-milter.conf

--- a/Containers/docker-socket-proxy/Dockerfile
+++ b/Containers/docker-socket-proxy/Dockerfile
@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM haproxy:3.2.6-alpine
+FROM haproxy:3.2.7-alpine

 # hadolint ignore=DL3002
 USER root
--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@ -6,7 +6,7 @@ FROM docker:28.5.1-cli AS docker
 FROM caddy:2.10.2-alpine AS caddy

 # From https://github.com/docker-library/php/blob/master/8.4/alpine3.22/fpm/Dockerfile
-FROM php:8.4.13-fpm-alpine3.22
+FROM php:8.4.14-fpm-alpine3.22

 EXPOSE 80
 EXPOSE 8080
--- a/Containers/nextcloud/Dockerfile
+++ b/Containers/nextcloud/Dockerfile
@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM php:8.3.26-fpm-alpine3.22
+FROM php:8.3.27-fpm-alpine3.22

 ENV PHP_MEMORY_LIMIT=512M
 ENV PHP_UPLOAD_LIMIT=16G
--- a/Containers/whiteboard/Dockerfile
+++ b/Containers/whiteboard/Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # Probably from this file: https://github.com/nextcloud/whiteboard/blob/main/Dockerfile
-FROM ghcr.io/nextcloud-releases/whiteboard:v1.3.0
+FROM ghcr.io/nextcloud-releases/whiteboard:v1.4.0

 USER root
 RUN set -ex; \
--- a/php/composer.lock
+++ b/php/composer.lock
@ -1646,16 +1646,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.21.1",
+            "version": "v3.22.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d"
+                "reference": "4509984193026de413baf4ba80f68590a7f2c51d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/285123877d4dd97dd7c11842ac5fb7e86e60d81d",
-                "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/4509984193026de413baf4ba80f68590a7f2c51d",
+                "reference": "4509984193026de413baf4ba80f68590a7f2c51d",
                "shasum": ""
            },
            "require": {
@ -1709,7 +1709,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.21.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.22.0"
            },
            "funding": [
                {
@ -1721,7 +1721,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-03T07:21:55+00:00"
+            "time": "2025-10-29T15:56:47+00:00"
        }
    ],
    "packages-dev": [
@ -3883,16 +3883,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v6.4.26",
+            "version": "v6.4.27",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "492de6dfd93910d7d7a729c5a04ddcd2b9e99c4f"
+                "reference": "13d3176cf8ad8ced24202844e9f95af11e2959fc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/492de6dfd93910d7d7a729c5a04ddcd2b9e99c4f",
-                "reference": "492de6dfd93910d7d7a729c5a04ddcd2b9e99c4f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/13d3176cf8ad8ced24202844e9f95af11e2959fc",
+                "reference": "13d3176cf8ad8ced24202844e9f95af11e2959fc",
                "shasum": ""
            },
            "require": {
@ -3957,7 +3957,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.26"
+                "source": "https://github.com/symfony/console/tree/v6.4.27"
            },
            "funding": [
                {
@ -3977,7 +3977,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-09-26T12:13:46+00:00"
+            "time": "2025-10-06T10:25:16+00:00"
        },
        {
            "name": "symfony/filesystem",
@ -4051,16 +4051,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v6.4.24",
+            "version": "v6.4.27",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "73089124388c8510efb8d2d1689285d285937b08"
+                "reference": "a1b6aa435d2fba50793b994a839c32b6064f063b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/73089124388c8510efb8d2d1689285d285937b08",
-                "reference": "73089124388c8510efb8d2d1689285d285937b08",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/a1b6aa435d2fba50793b994a839c32b6064f063b",
+                "reference": "a1b6aa435d2fba50793b994a839c32b6064f063b",
                "shasum": ""
            },
            "require": {
@ -4095,7 +4095,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.24"
+                "source": "https://github.com/symfony/finder/tree/v6.4.27"
            },
            "funding": [
                {
@ -4115,7 +4115,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-15T12:02:45+00:00"
+            "time": "2025-10-15T18:32:00+00:00"
        },
        {
            "name": "symfony/polyfill-intl-grapheme",
@ -4724,16 +4724,16 @@
        },
        {
            "name": "webmozart/assert",
-            "version": "1.12.0",
+            "version": "1.12.1",
            "source": {
                "type": "git",
                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "541057574806f942c94662b817a50f63f7345360"
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/541057574806f942c94662b817a50f63f7345360",
-                "reference": "541057574806f942c94662b817a50f63f7345360",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68",
+                "reference": "9be6926d8b485f55b9229203f962b51ed377ba68",
                "shasum": ""
            },
            "require": {
@ -4776,9 +4776,9 @@
            ],
            "support": {
                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.12.0"
+                "source": "https://github.com/webmozarts/assert/tree/1.12.1"
            },
-            "time": "2025-10-20T12:43:39+00:00"
+            "time": "2025-10-29T15:56:20+00:00"
        }
    ],
    "aliases": [],
Author	SHA1	Message	Date
Simon L.	ee7765ca6f	Merge pull request #7029 from masterwoot/patch-1 Some checks failed Codespell / Check spelling (push) Has been cancelled Details Docker Lint / docker-lint (push) Has been cancelled Details Lint php / php-lint (push) Has been cancelled Details PHP Deprecation Detector / PHP Deprecation Detector (push) Has been cancelled Details Static analysis / static-psalm-analysis (push) Has been cancelled Details Shellcheck / Check Shell (push) Has been cancelled Details Lint php / php-lint-summary (push) Has been cancelled Details borgbackup: fix typo in backupscript.sh	2025-10-31 15:36:17 +01:00
Simon L.	db5558a6b3	Merge pull request #7032 from winterrific/main clamav: change clamav-milter OnInfected Action to Reject	2025-10-31 15:35:49 +01:00
Ruben D.	3475a7b5d3	Change Milter OnInfected action to Reject Signed-off-by: Ruben D. <ruben@winterrific.net>	2025-10-31 15:30:44 +01:00
Simon L.	e4ad677a4c	Merge pull request #7046 from nextcloud/aio-dependency-update PHP dependency updates	2025-10-31 15:30:21 +01:00
Simon L.	dc9a9aed29	Merge pull request #7040 from nextcloud/dependabot/docker/Containers/whiteboard/nextcloud-releases/whiteboard-v1.4.0 build(deps): bump nextcloud-releases/whiteboard from v1.3.0 to v1.4.0 in /Containers/whiteboard	2025-10-31 15:29:34 +01:00
Simon L.	f0552d9d1a	Merge pull request #7039 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.3.27-fpm-alpine3.22 build(deps): bump php from 8.3.26-fpm-alpine3.22 to 8.3.27-fpm-alpine3.22 in /Containers/nextcloud	2025-10-31 15:29:14 +01:00
Simon L.	462e42de93	Merge pull request #7038 from nextcloud/dependabot/docker/Containers/docker-socket-proxy/haproxy-3.2.7-alpine build(deps): bump haproxy from 3.2.6-alpine to 3.2.7-alpine in /Containers/docker-socket-proxy	2025-10-31 15:28:54 +01:00
Simon L.	0f01279f41	Merge pull request #7037 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.4.14-fpm-alpine3.22 build(deps): bump php from 8.4.13-fpm-alpine3.22 to 8.4.14-fpm-alpine3.22 in /Containers/mastercontainer	2025-10-31 15:28:37 +01:00
szaimen	727d0d03db	php dependency updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-10-31 12:03:38 +00:00
dependabot[bot]	b7c6ab018d	build(deps): bump nextcloud-releases/whiteboard Bumps nextcloud-releases/whiteboard from v1.3.0 to v1.4.0. --- updated-dependencies: - dependency-name: nextcloud-releases/whiteboard dependency-version: v1.4.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-27 04:22:30 +00:00
dependabot[bot]	2598f1b983	build(deps): bump php in /Containers/nextcloud Bumps php from 8.3.26-fpm-alpine3.22 to 8.3.27-fpm-alpine3.22. --- updated-dependencies: - dependency-name: php dependency-version: 8.3.27-fpm-alpine3.22 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-27 04:22:17 +00:00
dependabot[bot]	19d5ad2a79	build(deps): bump haproxy in /Containers/docker-socket-proxy Bumps haproxy from 3.2.6-alpine to 3.2.7-alpine. --- updated-dependencies: - dependency-name: haproxy dependency-version: 3.2.7-alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-27 04:21:59 +00:00
dependabot[bot]	bf42de65da	build(deps): bump php in /Containers/mastercontainer Bumps php from 8.4.13-fpm-alpine3.22 to 8.4.14-fpm-alpine3.22. --- updated-dependencies: - dependency-name: php dependency-version: 8.4.14-fpm-alpine3.22 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-27 04:21:21 +00:00
masterwoot	5568c78293	Update backupscript.sh Typo in string messages, changing from "Nextclouds data directory.." to "Nextcloud's data directory.." as it's in the possessive form. Signed-off-by: masterwoot <company+github.com@maganti.se>	2025-10-24 09:59:57 +02:00