From 76d931ef01f39024efa3701f815ab677da8fccc1 Mon Sep 17 00:00:00 2001
From: Dan Feder <dan.feder@civicactions.com>
Date: Fri, 23 Apr 2021 16:59:42 -0400
Subject: [PATCH] Remove custom my.cnf and add timeout

---
 assets/docker/docker-compose.common.yml |  4 ----
 assets/docker/etc/mysql/my.cnf          | 22 ----------------------
 assets/docker/mysql.env                 |  1 +
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 assets/docker/etc/mysql/my.cnf

diff --git a/assets/docker/docker-compose.common.yml b/assets/docker/docker-compose.common.yml
index 526f774f..820390a1 100755
--- a/assets/docker/docker-compose.common.yml
+++ b/assets/docker/docker-compose.common.yml
@@ -34,10 +34,6 @@ services:
     # MYSQL Credentials in mysql.env
     env_file:
       - "${DKTL_DIRECTORY}/assets/docker/mysql.env"
-    volumes:
-       # MySQL configuration overrides
-       - "${DKTL_DIRECTORY}/assets/docker/etc/mysql/my.cnf:/etc/mysql/conf.d/z_my.cnf"
-
   # CLI node
   # Used for all console commands and tools.
   cli:
diff --git a/assets/docker/etc/mysql/my.cnf b/assets/docker/etc/mysql/my.cnf
deleted file mode 100644
index 2cd1f9c3..00000000
--- a/assets/docker/etc/mysql/my.cnf
+++ /dev/null
@@ -1,22 +0,0 @@
-[mysqld]
-###############################
-local_infile=1
-# Acquia DD settings
-#set innodb as default
-default-storage-engine=InnoDB
-
-innodb_log_buffer_size=32M
-innodb_buffer_pool_size=256M
-innodb_log_file_size=32M
-
-innodb_file_per_table=1
-
-#Max packets
-max_allowed_packet = 128M
-
-#Enable slow query log
-long_query_time=1
-slow_query_log=1
-slow_query_log_file=slow.log
-
-###############################
diff --git a/assets/docker/mysql.env b/assets/docker/mysql.env
index 6be3b97d..428c250f 100755
--- a/assets/docker/mysql.env
+++ b/assets/docker/mysql.env
@@ -2,3 +2,4 @@ MYSQL_ROOT_PASSWORD=admin123
 MYSQL_USER=drupal
 MYSQL_PASSWORD=123
 MYSQL_DATABASE=drupal
+MYSQL_WAIT_TIMEOUT=28800
\ No newline at end of file