Merge 3fb5f13b2e into 30b570f0b5

Update to correct MariaDB command
Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>
2025-08-01 02:58:05 +02:00 · 2024-09-18 21:53:12 +00:00 · 2024-09-19 00:52:45 +03:00 · 2024-09-19 00:22:08 +03:00 · 2024-09-18 20:45:28 +00:00 · 2024-09-18 20:45:15 +00:00
16 changed files with 16 additions and 16 deletions
--- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml
+++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml
@ -1,7 +1,7 @@
 services:
  db:
    image: mariadb:10.6
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF
    restart: always
    volumes:
      - db:/var/lib/mysql:Z
--- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml
@ -1,7 +1,7 @@
 services:
  db:
    image: mariadb:10.6
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF
    restart: always
    volumes:
      - db:/var/lib/mysql:Z
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
@ -1,7 +1,7 @@
 services:
  db:
    image: mariadb:10.6
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF
    restart: always
    volumes:
      - db:/var/lib/mysql:Z
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
@ -1,7 +1,7 @@
 services:
  db:
    image: mariadb:10.6
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF
    restart: always
    volumes:
      - db:/var/lib/mysql:Z
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml
@ -51,7 +51,7 @@ services:
    labels:
      - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy"
    volumes:
-      - certs:/etc/nginx/certs:ro:z
+      - certs:/etc/nginx/certs:ro,z
      - vhost.d:/etc/nginx/vhost.d:z
      - html:/usr/share/nginx/html:z
      - /var/run/docker.sock:/tmp/docker.sock:z,ro
--- a/28/apache/entrypoint.sh
+++ b/28/apache/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/28/fpm-alpine/entrypoint.sh
+++ b/28/fpm-alpine/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/28/fpm/entrypoint.sh
+++ b/28/fpm/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/29/apache/entrypoint.sh
+++ b/29/apache/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/29/fpm-alpine/entrypoint.sh
+++ b/29/fpm-alpine/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/29/fpm/entrypoint.sh
+++ b/29/fpm/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/30/apache/entrypoint.sh
+++ b/30/apache/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/30/fpm-alpine/entrypoint.sh
+++ b/30/fpm-alpine/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/30/fpm/entrypoint.sh
+++ b/30/fpm/entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
    for cfgPath in /usr/src/nextcloud/config/*.php; do
        cfgFile=$(basename "$cfgPath")

-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
            fi
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-stable_channel='29.0.6'
+stable_channel='29.0.7'

 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
Author	SHA1	Message	Date
Kaloyan Nikolov	9289a9b461	Merge `3fb5f13b2e` into `30b570f0b5`	2024-09-18 21:53:12 +00:00
Kaloyan Nikolov	3fb5f13b2e	Update to correct MariaDB command Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-19 00:52:45 +03:00
Kaloyan Nikolov	c31a0a8035	Merge branch 'nextcloud:master' into compose-v2	2024-09-19 00:22:08 +03:00
GitHub Workflow	30b570f0b5	Runs update.sh	2024-09-18 20:45:28 +00:00
Florian Latifi	2bc1036e61	Exclude autoconfig.php from user config check (#2290 ) Signed-off-by: Florian Latifi <mail@florian-latifi.at>	2024-09-18 20:45:15 +00:00
J0WI	f87e26d355	Update .examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml Signed-off-by: J0WI <J0WI@users.noreply.github.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	326ed47848	typo Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	a39742175e	Removed GH specific markdown from Readme, change mariadb to recommended version Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	cbcbeea070	Remove extra nginx volume Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	e87ce110f3	Restored MariaDB to 10.6 as per docs suggestions Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	d2edd7df49	Removed logging from compose files. Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	c90aee5f6c	Typos fixed, minor clarification changes Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	2d439a2b6d	Add mjs file extension in a proper way. Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	bd456a2ab1	Fix cache control Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	4b9c57d1e4	Add missing headers to fpm config Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	ee6e17785d	Fix wrong environment variable Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	f4d89ecb29	Minor readme updates to match the changes for the compose v2 syntax. Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
Kaloyan Nikolov	6dc29f2a72	Update examples section according to the latest docker compose requirements. Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>	2024-09-18 20:06:41 +00:00
John Molakvoæ	a1e93f429c	Bump stable to 29.0.7 (#2297 ) Fix #2294 Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>	2024-09-18 19:43:16 +00:00