Merge f20e7fc48f into 8d2e9048bc

* expire binlog

expire binlog entries older than a week to avoid unbounded binlog growth over longer timespans

Signed-off-by: HPPinata <83947761+HPPinata@users.noreply.github.com>

* kill binlog

remove all references and options regarding binlog from docker compose files

Signed-off-by: HPPinata <83947761+HPPinata@users.noreply.github.com>

---------

Signed-off-by: HPPinata <83947761+HPPinata@users.noreply.github.com>

.examples/docker-compose/insecure/mariadb/apache/compose.yaml

@@ -1,7 +1,7 @@
 services:
   db:
     image: mariadb:10.11
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
       - db:/var/lib/mysql:Z

.examples/docker-compose/insecure/mariadb/fpm/compose.yaml

@@ -1,7 +1,7 @@
 services:
   db:
     image: mariadb:10.11
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
       - db:/var/lib/mysql:Z

.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml

@@ -1,7 +1,7 @@
 services:
   db:
     image: mariadb:10.11
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
       - db:/var/lib/mysql:Z

.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml

@@ -1,7 +1,7 @@
 services:
   db:
     image: mariadb:10.11
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
       - db:/var/lib/mysql:Z

README.md

@@ -395,7 +395,7 @@ services:
   db:
     image: mariadb:10.11
     restart: always
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED
     volumes:
       - db:/var/lib/mysql
     environment:
@@ -443,7 +443,7 @@ services:
   db:
     image: mariadb:10.11
     restart: always
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED
     volumes:
       - db:/var/lib/mysql
     environment:

docker-entrypoint.sh

@@ -172,12 +172,24 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
             fi
 
             rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
+            if [ "$?" -ne "0" ]; then
+                echo "Rsync failed. Giving up to be safe."
+                exit 1
+       	    fi
             for dir in config data custom_apps themes; do
                 if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
                     rsync $rsync_options --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
+                    if [ "$?" -ne "0" ]; then
+                        echo "Rsync failed. Giving up to be safe."
+                        exit 1
+                    fi
                 fi
             done
             rsync $rsync_options --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
+            if [ "$?" -ne "0" ]; then
+     		    echo "Rsync failed. Giving up to be safe."
+               exit 1
+       	    fi
 
             # Install
             if [ "$installed_version" = "0.0.0.0" ]; then