Use custom Dockerfile instead of mounted config

Signed-off-by: Tilo Spannagel <development@tilosp.de>

28 files changed, 68 insertions, 52 deletions

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 00000000..d9a5cfb4
--- /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
index 15e5a425..527a3f0e 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 3b25bc68..a08fc9fb 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 00000000..d9a5cfb4
--- /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
index 15e5a425..527a3f0e 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 f072a803..76f7863a 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 00000000..d9a5cfb4
--- /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
index 15e5a425..527a3f0e 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 a048fcd6..d5612444 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 00000000..d9a5cfb4
--- /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
index 15e5a425..527a3f0e 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 52095ed8..7b9cd4b6 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 00000000..d9a5cfb4
--- /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 00000000..527a3f0e
--- /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 f8213f5d..65561cbe 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 15e5a425..00000000
--- 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 00000000..d9a5cfb4
--- /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 00000000..527a3f0e
--- /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 cb654f68..cb03fe93 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 15e5a425..00000000
--- 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 00000000..d9a5cfb4
--- /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 00000000..527a3f0e
--- /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 aeb2d6b0..738bdeb7 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 15e5a425..00000000
--- 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 00000000..d9a5cfb4
--- /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 00000000..527a3f0e
--- /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 7d2b7916..fc1bdd60 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 15e5a425..00000000
--- 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