From 7c8997ae9cfa1caf73fa61503f29898d8f4e94f4 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Tue, 24 Sep 2024 23:32:33 +0300 Subject: [PATCH 1/2] Added back --log-bin to MariaDB command. See PR 1881 Signed-off-by: Kaloyan Nikolov --- .examples/README.md | 2 +- .examples/docker-compose/insecure/mariadb/apache/compose.yaml | 2 +- .examples/docker-compose/insecure/mariadb/fpm/compose.yaml | 2 +- .../with-nginx-proxy/mariadb/apache/compose.yaml | 2 +- .../docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml | 2 +- README.md | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.examples/README.md b/.examples/README.md index 7e3903c1..52603fe8 100644 --- a/.examples/README.md +++ b/.examples/README.md @@ -68,7 +68,7 @@ The following Dockerfile commands are also necessary for a sucessfull cron insta In `docker-compose` additional services are bundled to create a complete nextcloud installation. The examples are designed to run out-of-the-box. Before running the examples you have to modify the `db.env` and `compose.yaml` file and fill in your custom information. -The docker-compose examples make heavily use of derived Dockerfiles to add configuration files into the containers. This way they should also work on remote docker systems as _Docker for Windows_. When running docker compose on the same host as the docker daemon, another possibility would be to simply mount the files in the volumes section in the `compose.yaml` file. +The docker compose examples make heavily use of derived Dockerfiles to add configuration files into the containers. This way they should also work on remote docker systems as _Docker for Windows_. When running docker compose on the same host as the docker daemon, another possibility would be to simply mount the files in the volumes section in the `compose.yaml` file. ### insecure diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml index c2132842..5eb2fdea 100644 --- 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 --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml index 90fae9a5..e1ccd70c 100644 --- 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 --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml index 91dfdb80..56c5cf2c 100644 --- 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 --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml index e4379b2b..f0a198d6 100644 --- 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 --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/README.md b/README.md index ae12a30b..a1851ec2 100644 --- a/README.md +++ b/README.md @@ -296,7 +296,7 @@ services: db: image: mariadb:10.6 restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin --binlog-format=ROW volumes: - db:/var/lib/mysql logging: @@ -352,7 +352,7 @@ services: db: image: mariadb:10.6 restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin --binlog-format=ROW volumes: - db:/var/lib/mysql logging: From fb95b6013c7c14d10eadd201dd95adbe0f0ed5ff Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Tue, 24 Sep 2024 23:38:56 +0300 Subject: [PATCH 2/2] Remove wrongly added logging to Readme.MD Signed-off-by: Kaloyan Nikolov --- README.md | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/README.md b/README.md index a1851ec2..7d450793 100644 --- a/README.md +++ b/README.md @@ -299,10 +299,6 @@ services: command: --transaction-isolation=READ-COMMITTED --log-bin --binlog-format=ROW volumes: - db:/var/lib/mysql - logging: - driver: "json-file" - options: - max-size: "50m" environment: - MYSQL_ROOT_PASSWORD= - MYSQL_PASSWORD= @@ -318,10 +314,6 @@ services: restart: always ports: - 8080:80 - logging: - driver: "json-file" - options: - max-size: "50m" depends_on: - redis - db @@ -355,10 +347,6 @@ services: command: --transaction-isolation=READ-COMMITTED --log-bin --binlog-format=ROW volumes: - db:/var/lib/mysql - logging: - driver: "json-file" - options: - max-size: "50m" environment: - MYSQL_ROOT_PASSWORD= - MYSQL_PASSWORD= @@ -372,10 +360,6 @@ services: app: image: nextcloud:fpm restart: always - logging: - driver: "json-file" - options: - max-size: "50m" depends_on: - redis - db @@ -413,10 +397,6 @@ services: db: image: postgres restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/postgresql/data environment: @@ -434,10 +414,6 @@ services: app: image: nextcloud restart: always - logging: - driver: "json-file" - options: - max-size: "50m" ports: - 8080:80 volumes: