From b2e04519ede24116f48de88f9d318df4d35dea6f Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Wed, 21 Mar 2018 14:33:03 +0100 Subject: [PATCH] Use custom Dockerfile instead of mounted config Signed-off-by: Tilo Spannagel --- .../insecure/mariadb-cron-redis/apache/db/Dockerfile | 4 ++++ .../apache/{mysql.conf => db/transaction-isolation.conf} | 4 ++-- .../insecure/mariadb-cron-redis/apache/docker-compose.yml | 4 +--- .../insecure/mariadb-cron-redis/fpm/db/Dockerfile | 4 ++++ .../fpm/{mysql.conf => db/transaction-isolation.conf} | 4 ++-- .../insecure/mariadb-cron-redis/fpm/docker-compose.yml | 4 +--- .../docker-compose/insecure/mariadb/apache/db/Dockerfile | 4 ++++ .../apache/{mysql.conf => db/transaction-isolation.conf} | 4 ++-- .../insecure/mariadb/apache/docker-compose.yml | 4 +--- .examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile | 4 ++++ .../fpm/{mysql.conf => db/transaction-isolation.conf} | 4 ++-- .../docker-compose/insecure/mariadb/fpm/docker-compose.yml | 4 +--- .../with-nginx-proxy/mariadb-cron-redis/apache/db/Dockerfile | 4 ++++ .../mariadb-cron-redis/apache/db/transaction-isolation.conf | 5 +++++ .../mariadb-cron-redis/apache/docker-compose.yml | 4 +--- .../with-nginx-proxy/mariadb-cron-redis/apache/mysql.conf | 5 ----- .../with-nginx-proxy/mariadb-cron-redis/fpm/db/Dockerfile | 4 ++++ .../mariadb-cron-redis/fpm/db/transaction-isolation.conf | 5 +++++ .../mariadb-cron-redis/fpm/docker-compose.yml | 4 +--- .../with-nginx-proxy/mariadb-cron-redis/fpm/mysql.conf | 5 ----- .../with-nginx-proxy/mariadb/apache/db/Dockerfile | 4 ++++ .../mariadb/apache/db/transaction-isolation.conf | 5 +++++ .../with-nginx-proxy/mariadb/apache/docker-compose.yml | 4 +--- .../with-nginx-proxy/mariadb/apache/mysql.conf | 5 ----- .../with-nginx-proxy/mariadb/fpm/db/Dockerfile | 4 ++++ .../mariadb/fpm/db/transaction-isolation.conf | 5 +++++ .../with-nginx-proxy/mariadb/fpm/docker-compose.yml | 4 +--- .../docker-compose/with-nginx-proxy/mariadb/fpm/mysql.conf | 5 ----- 28 files changed, 68 insertions(+), 52 deletions(-) create mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/apache/db/Dockerfile rename .examples/docker-compose/insecure/mariadb-cron-redis/apache/{mysql.conf => db/transaction-isolation.conf} (69%) create mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/Dockerfile rename .examples/docker-compose/insecure/mariadb-cron-redis/fpm/{mysql.conf => db/transaction-isolation.conf} (69%) create mode 100644 .examples/docker-compose/insecure/mariadb/apache/db/Dockerfile rename .examples/docker-compose/insecure/mariadb/apache/{mysql.conf => db/transaction-isolation.conf} (69%) create mode 100644 .examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile rename .examples/docker-compose/insecure/mariadb/fpm/{mysql.conf => db/transaction-isolation.conf} (69%) create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/Dockerfile create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/mysql.conf create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/Dockerfile create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/mysql.conf create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/db/Dockerfile create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/mysql.conf create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/Dockerfile create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/mysql.conf diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db/Dockerfile new file mode 100644 index 0000000..d9a5cfb --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db/Dockerfile @@ -0,0 +1,4 @@ +FROM mariadb +#FROM mysql + +COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/mysql.conf b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db/transaction-isolation.conf similarity index 69% rename from .examples/docker-compose/insecure/mariadb-cron-redis/apache/mysql.conf rename to .examples/docker-compose/insecure/mariadb-cron-redis/apache/db/transaction-isolation.conf index 15e5a42..527a3f0 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/mysql.conf +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db/transaction-isolation.conf @@ -1,5 +1,5 @@ [mysqld] # Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) # ================================================ -# https://docs.nextcloud.com/server/12/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level -transaction-isolation = READ-COMMITTED \ No newline at end of file +# https://docs.nextcloud.com/server/13/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level +transaction-isolation = READ-COMMITTED diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml index 3b25bc6..a08fc9f 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml @@ -2,12 +2,10 @@ version: '3' services: db: - image: mariadb - # image: mysql + build: ./db restart: always volumes: - db:/var/lib/mysql - - ./mysql.conf:/etc/mysql/conf.d/mysql-config.cnf environment: - MYSQL_ROOT_PASSWORD= env_file: diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/Dockerfile new file mode 100644 index 0000000..d9a5cfb --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/Dockerfile @@ -0,0 +1,4 @@ +FROM mariadb +#FROM mysql + +COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/mysql.conf b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/transaction-isolation.conf similarity index 69% rename from .examples/docker-compose/insecure/mariadb-cron-redis/fpm/mysql.conf rename to .examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/transaction-isolation.conf index 15e5a42..527a3f0 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/mysql.conf +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/transaction-isolation.conf @@ -1,5 +1,5 @@ [mysqld] # Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) # ================================================ -# https://docs.nextcloud.com/server/12/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level -transaction-isolation = READ-COMMITTED \ No newline at end of file +# https://docs.nextcloud.com/server/13/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level +transaction-isolation = READ-COMMITTED diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml index f072a80..76f7863 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml @@ -2,12 +2,10 @@ version: '3' services: db: - image: mariadb - # image: mysql + build: ./db restart: always volumes: - db:/var/lib/mysql - - ./mysql.conf:/etc/mysql/conf.d/mysql-config.cnf environment: - MYSQL_ROOT_PASSWORD= env_file: diff --git a/.examples/docker-compose/insecure/mariadb/apache/db/Dockerfile b/.examples/docker-compose/insecure/mariadb/apache/db/Dockerfile new file mode 100644 index 0000000..d9a5cfb --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb/apache/db/Dockerfile @@ -0,0 +1,4 @@ +FROM mariadb +#FROM mysql + +COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/insecure/mariadb/apache/mysql.conf b/.examples/docker-compose/insecure/mariadb/apache/db/transaction-isolation.conf similarity index 69% rename from .examples/docker-compose/insecure/mariadb/apache/mysql.conf rename to .examples/docker-compose/insecure/mariadb/apache/db/transaction-isolation.conf index 15e5a42..527a3f0 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/mysql.conf +++ b/.examples/docker-compose/insecure/mariadb/apache/db/transaction-isolation.conf @@ -1,5 +1,5 @@ [mysqld] # Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) # ================================================ -# https://docs.nextcloud.com/server/12/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level -transaction-isolation = READ-COMMITTED \ No newline at end of file +# https://docs.nextcloud.com/server/13/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level +transaction-isolation = READ-COMMITTED diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml index a048fcd..d561244 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml @@ -2,12 +2,10 @@ version: '3' services: db: - image: mariadb - # image: mysql + build: ./db restart: always volumes: - db:/var/lib/mysql - - ./mysql.conf:/etc/mysql/conf.d/mysql-config.cnf environment: - MYSQL_ROOT_PASSWORD= env_file: diff --git a/.examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile new file mode 100644 index 0000000..d9a5cfb --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile @@ -0,0 +1,4 @@ +FROM mariadb +#FROM mysql + +COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/insecure/mariadb/fpm/mysql.conf b/.examples/docker-compose/insecure/mariadb/fpm/db/transaction-isolation.conf similarity index 69% rename from .examples/docker-compose/insecure/mariadb/fpm/mysql.conf rename to .examples/docker-compose/insecure/mariadb/fpm/db/transaction-isolation.conf index 15e5a42..527a3f0 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/mysql.conf +++ b/.examples/docker-compose/insecure/mariadb/fpm/db/transaction-isolation.conf @@ -1,5 +1,5 @@ [mysqld] # Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) # ================================================ -# https://docs.nextcloud.com/server/12/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level -transaction-isolation = READ-COMMITTED \ No newline at end of file +# https://docs.nextcloud.com/server/13/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level +transaction-isolation = READ-COMMITTED diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml index 52095ed..7b9cd4b 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml @@ -2,12 +2,10 @@ version: '3' services: db: - image: mariadb - # image: mysql + build: ./db restart: always volumes: - db:/var/lib/mysql - - ./mysql.conf:/etc/mysql/conf.d/mysql-config.cnf environment: - MYSQL_ROOT_PASSWORD= env_file: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/Dockerfile new file mode 100644 index 0000000..d9a5cfb --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/Dockerfile @@ -0,0 +1,4 @@ +FROM mariadb +#FROM mysql + +COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/transaction-isolation.conf b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/transaction-isolation.conf new file mode 100644 index 0000000..527a3f0 --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/transaction-isolation.conf @@ -0,0 +1,5 @@ +[mysqld] +# Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) +# ================================================ +# https://docs.nextcloud.com/server/13/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level +transaction-isolation = READ-COMMITTED diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml index f8213f5..65561cb 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml @@ -2,12 +2,10 @@ version: '3' services: db: - image: mariadb - # image: mysql + build: ./db restart: always volumes: - db:/var/lib/mysql - - ./mysql.conf:/etc/mysql/conf.d/mysql-config.cnf environment: - MYSQL_ROOT_PASSWORD= env_file: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/mysql.conf b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/mysql.conf deleted file mode 100644 index 15e5a42..0000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/mysql.conf +++ /dev/null @@ -1,5 +0,0 @@ -[mysqld] -# Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) -# ================================================ -# https://docs.nextcloud.com/server/12/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level -transaction-isolation = READ-COMMITTED \ No newline at end of file diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/Dockerfile new file mode 100644 index 0000000..d9a5cfb --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/Dockerfile @@ -0,0 +1,4 @@ +FROM mariadb +#FROM mysql + +COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/transaction-isolation.conf b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/transaction-isolation.conf new file mode 100644 index 0000000..527a3f0 --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/transaction-isolation.conf @@ -0,0 +1,5 @@ +[mysqld] +# Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) +# ================================================ +# https://docs.nextcloud.com/server/13/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level +transaction-isolation = READ-COMMITTED diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml index cb654f6..cb03fe9 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml @@ -2,12 +2,10 @@ version: '3' services: db: - image: mariadb - # image: mysql + build: ./db restart: always volumes: - db:/var/lib/mysql - - ./mysql.conf:/etc/mysql/conf.d/mysql-config.cnf environment: - MYSQL_ROOT_PASSWORD= env_file: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/mysql.conf b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/mysql.conf deleted file mode 100644 index 15e5a42..0000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/mysql.conf +++ /dev/null @@ -1,5 +0,0 @@ -[mysqld] -# Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) -# ================================================ -# https://docs.nextcloud.com/server/12/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level -transaction-isolation = READ-COMMITTED \ No newline at end of file diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/Dockerfile new file mode 100644 index 0000000..d9a5cfb --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/Dockerfile @@ -0,0 +1,4 @@ +FROM mariadb +#FROM mysql + +COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/transaction-isolation.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/transaction-isolation.conf new file mode 100644 index 0000000..527a3f0 --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/transaction-isolation.conf @@ -0,0 +1,5 @@ +[mysqld] +# Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) +# ================================================ +# https://docs.nextcloud.com/server/13/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level +transaction-isolation = READ-COMMITTED diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml index aeb2d6b..738bdeb 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml @@ -2,12 +2,10 @@ version: '3' services: db: - image: mariadb - # image: mysql + build: ./db restart: always volumes: - db:/var/lib/mysql - - ./mysql.conf:/etc/mysql/conf.d/mysql-config.cnf environment: - MYSQL_ROOT_PASSWORD= env_file: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/mysql.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/mysql.conf deleted file mode 100644 index 15e5a42..0000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/mysql.conf +++ /dev/null @@ -1,5 +0,0 @@ -[mysqld] -# Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) -# ================================================ -# https://docs.nextcloud.com/server/12/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level -transaction-isolation = READ-COMMITTED \ No newline at end of file diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/Dockerfile new file mode 100644 index 0000000..d9a5cfb --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/Dockerfile @@ -0,0 +1,4 @@ +FROM mariadb +#FROM mysql + +COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/transaction-isolation.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/transaction-isolation.conf new file mode 100644 index 0000000..527a3f0 --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/transaction-isolation.conf @@ -0,0 +1,5 @@ +[mysqld] +# Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) +# ================================================ +# https://docs.nextcloud.com/server/13/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level +transaction-isolation = READ-COMMITTED diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml index 7d2b791..fc1bdd6 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml @@ -2,12 +2,10 @@ version: '3' services: db: - image: mariadb - # image: mysql + build: ./db restart: always volumes: - db:/var/lib/mysql - - ./mysql.conf:/etc/mysql/conf.d/mysql-config.cnf environment: - MYSQL_ROOT_PASSWORD= env_file: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/mysql.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/mysql.conf deleted file mode 100644 index 15e5a42..0000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/mysql.conf +++ /dev/null @@ -1,5 +0,0 @@ -[mysqld] -# Set Transaction isolation Level to READ-COMMITED (Required by nextcloud) -# ================================================ -# https://docs.nextcloud.com/server/12/admin_manual/configuration_database/linux_database_configuration.html#database-read-commited-transaction-isolation-level -transaction-isolation = READ-COMMITTED \ No newline at end of file