From d905503a6e705c92538f2b9069b7674ef99b9e53 Mon Sep 17 00:00:00 2001 From: rabaraho Date: Thu, 19 Apr 2018 12:47:19 -0400 Subject: [PATCH] Changed db build to pre-existing image with command arguments --- .../insecure/mariadb-cron-redis/apache/db/Dockerfile | 4 ---- .../mariadb-cron-redis/apache/db/transaction-isolation.conf | 5 ----- .../insecure/mariadb-cron-redis/apache/docker-compose.yml | 3 ++- .../insecure/mariadb-cron-redis/fpm/db/Dockerfile | 4 ---- .../mariadb-cron-redis/fpm/db/transaction-isolation.conf | 5 ----- .../insecure/mariadb-cron-redis/fpm/docker-compose.yml | 3 ++- .../docker-compose/insecure/mariadb/apache/db/Dockerfile | 4 ---- .../insecure/mariadb/apache/db/transaction-isolation.conf | 5 ----- .../insecure/mariadb/apache/docker-compose.yml | 3 ++- .examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile | 4 ---- .../insecure/mariadb/fpm/db/transaction-isolation.conf | 5 ----- .../docker-compose/insecure/mariadb/fpm/docker-compose.yml | 3 ++- .../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 | 3 ++- .../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 | 3 ++- .../with-nginx-proxy/mariadb/apache/db/Dockerfile | 4 ---- .../mariadb/apache/db/transaction-isolation.conf | 5 ----- .../with-nginx-proxy/mariadb/apache/docker-compose.yml | 3 ++- .../with-nginx-proxy/mariadb/fpm/db/Dockerfile | 4 ---- .../mariadb/fpm/db/transaction-isolation.conf | 5 ----- .../with-nginx-proxy/mariadb/fpm/docker-compose.yml | 3 ++- 24 files changed, 16 insertions(+), 80 deletions(-) delete mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/apache/db/Dockerfile delete mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/apache/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/Dockerfile delete mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/insecure/mariadb/apache/db/Dockerfile delete mode 100644 .examples/docker-compose/insecure/mariadb/apache/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile delete mode 100644 .examples/docker-compose/insecure/mariadb/fpm/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/Dockerfile delete 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/fpm/db/Dockerfile delete 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/apache/db/Dockerfile delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/db/transaction-isolation.conf delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/Dockerfile delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/transaction-isolation.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 deleted file mode 100644 index d9a5cfb4..00000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -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/db/transaction-isolation.conf b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db/transaction-isolation.conf deleted file mode 100644 index 527a3f0e..00000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db/transaction-isolation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml index a08fc9fb..8073f6e2 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,7 +2,8 @@ version: '3' services: db: - build: ./db + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/Dockerfile deleted file mode 100644 index d9a5cfb4..00000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -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/db/transaction-isolation.conf b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/transaction-isolation.conf deleted file mode 100644 index 527a3f0e..00000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/db/transaction-isolation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml index 76f7863a..4cf30729 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,7 +2,8 @@ version: '3' services: db: - build: ./db + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/.examples/docker-compose/insecure/mariadb/apache/db/Dockerfile b/.examples/docker-compose/insecure/mariadb/apache/db/Dockerfile deleted file mode 100644 index d9a5cfb4..00000000 --- a/.examples/docker-compose/insecure/mariadb/apache/db/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM mariadb -#FROM mysql - -COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/insecure/mariadb/apache/db/transaction-isolation.conf b/.examples/docker-compose/insecure/mariadb/apache/db/transaction-isolation.conf deleted file mode 100644 index 527a3f0e..00000000 --- a/.examples/docker-compose/insecure/mariadb/apache/db/transaction-isolation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml index d5612444..18f276a2 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml @@ -2,7 +2,8 @@ version: '3' services: db: - build: ./db + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/.examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile deleted file mode 100644 index d9a5cfb4..00000000 --- a/.examples/docker-compose/insecure/mariadb/fpm/db/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM mariadb -#FROM mysql - -COPY transaction-isolation.conf /etc/mysql/conf.d/transaction-isolation.conf diff --git a/.examples/docker-compose/insecure/mariadb/fpm/db/transaction-isolation.conf b/.examples/docker-compose/insecure/mariadb/fpm/db/transaction-isolation.conf deleted file mode 100644 index 527a3f0e..00000000 --- a/.examples/docker-compose/insecure/mariadb/fpm/db/transaction-isolation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml index 7b9cd4b6..70324b1e 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml @@ -2,7 +2,8 @@ version: '3' services: db: - build: ./db + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql 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 deleted file mode 100644 index d9a5cfb4..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 527a3f0e..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/db/transaction-isolation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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 80a03675..3d74dd24 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,7 +2,8 @@ version: '3' services: db: - build: ./db + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql 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 deleted file mode 100644 index d9a5cfb4..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 527a3f0e..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/db/transaction-isolation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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 8c29b9fe..663534e7 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,7 +2,8 @@ version: '3' services: db: - build: ./db + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/Dockerfile deleted file mode 100644 index d9a5cfb4..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 527a3f0e..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/db/transaction-isolation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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 004a0b86..ace221ee 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,7 +2,8 @@ version: '3' services: db: - build: ./db + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/Dockerfile deleted file mode 100644 index d9a5cfb4..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 527a3f0e..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/db/transaction-isolation.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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 3db0ac13..69e6aaaf 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,7 +2,8 @@ version: '3' services: db: - build: ./db + image: mariadb + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql