Update

viljaste · viljaste · commit 0cb5ab52c816 · 2015-12-09T00:00:49.000+02:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,5 +1,5 @@
-var current_version = '1.1.0';
-var new_version = '1.1.1';
+var current_version = '1.1.1';
+var new_version = '1.2.0';
 
 module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-replace');
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This project is part of the [Dockerized Drupal](https://dockerizedrupal.com/) in
       -h "${CONTAINER}" \
       -v /mysql \
       --entrypoint /bin/echo \
-      dockerizedrupal/mysql:1.1.1 "Data-only container for Jenkins."
+      dockerizedrupal/mysql:1.2.0 "Data-only container for Jenkins."
 
     CONTAINER="mysql" && sudo docker run \
       --name "${CONTAINER}" \
@@ -24,16 +24,24 @@ This project is part of the [Dockerized Drupal](https://dockerizedrupal.com/) in
       -e GENERAL_LOG="0" \
       -e SLOW_QUERY_LOG="0" \
       -e LONG_QUERY_TIME="1" \
+      -e QUERY_CACHE_TYPE="0" \
+      -e QUERY_CACHE_SIZE="1M" \
+      -e QUERY_CACHE_LIMIT="1M" \
+      -e QUERY_CACHE_MIN_RES_UNIT="4K" \
+      -e MAX_ALLOWED_PACKET="16M" \
+      -e KEY_BUFFER_SIZE="16M" \
+      -e KEY_BUFFER_SIZE="8" \
+      -e INNODB_BUFFER_POOL_SIZE="128M" \
       -d \
-      dockerizedrupal/mysql:1.1.1
+      dockerizedrupal/mysql:1.2.0
 
 ## Build the image
 
     TMP="$(mktemp -d)" \
       && git clone https://github.com/dockerizedrupal/docker-mysql.git "${TMP}" \
       && cd "${TMP}" \
-      && git checkout 1.1.1 \
-      && sudo docker build -t dockerizedrupal/mysql:1.1.1 . \
+      && git checkout 1.2.0 \
+      && sudo docker build -t dockerizedrupal/mysql:1.2.0 . \
       && cd -
 
 ## Changing the container behaviour on runtime through environment variables
diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-1.1.1
+1.2.0
diff --git a/Vagrantfile b/Vagrantfile
@@ -1,4 +1,4 @@
-VERSION = "1.1.1"
+VERSION = "1.2.0"
 
 require 'yaml'
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,17 +1,25 @@
 mysql:
-  image: dockerizedrupal/mysql:1.1.1
+  image: dockerizedrupal/mysql:1.2.0
   hostname: mysql
   ports:
     - "3306:3306"
   volumes_from:
     - mysql-data
   environment:
     TIMEZONE: Etc/UTC
-    GENERAL_LOG: 0
-    SLOW_QUERY_LOG: 0
+    GENERAL_LOG: 1
+    SLOW_QUERY_LOG: 1
     LONG_QUERY_TIME: 1
+    QUERY_CACHE_TYPE: 1
+    QUERY_CACHE_SIZE: 1M
+    QUERY_CACHE_LIMIT: 1M
+    QUERY_CACHE_MIN_RES_UNIT: 4K
+    MAX_ALLOWED_PACKET: 16M
+    KEY_BUFFER_SIZE: 16M
+    THREAD_CACHE_SIZE: 8
+    INNODB_BUFFER_POOL_SIZE: 128M
 mysql-data:
-  image: dockerizedrupal/mysql:1.1.1
+  image: dockerizedrupal/mysql:1.2.0
   hostname: mysql-data
   entrypoint: ["/bin/echo", "Data-only container for MySQL."]
   volumes:
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docker-mysql",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/dockerizedrupal/docker-mysql.git"
diff --git a/src/mysql/build/modules/build/files/etc/mysql/my.cnf b/src/mysql/build/modules/build/files/etc/mysql/my.cnf
@@ -21,25 +21,16 @@ skip-external-locking
 skip_name_resolve
 bind-address = 0.0.0.0
 
-key_buffer_size = 16M
-max_allowed_packet = 16M
-thread_stack = 192K
-thread_cache_size = 8
+thread_stack = 256K
 myisam-recover-options = BACKUP
-query_cache_limit = 1M
-query_cache_size = 0
 expire_logs_days = 3
 max_binlog_size = 100M
 
 [mysqldump]
 quick
 quote-names
-max_allowed_packet = 16M
 
 [mysql]
-#no-auto-rehash # faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer_size = 16M
+no-auto-rehash
 
 !includedir /etc/mysql/conf.d/
diff --git a/src/mysql/build/modules/build/files/etc/supervisor/conf.d/mysql_stderr.conf b/src/mysql/build/modules/build/files/etc/supervisor/conf.d/mysql_stderr.conf
diff --git a/src/mysql/build/modules/build/files/etc/supervisor/conf.d/mysql_stdout.conf b/src/mysql/build/modules/build/files/etc/supervisor/conf.d/mysql_stdout.conf
diff --git a/src/mysql/build/modules/build/manifests/mysql.pp b/src/mysql/build/modules/build/manifests/mysql.pp
@@ -1,6 +1,7 @@
 class build::mysql {
   require build::mysql::packages
   require build::mysql::supervisor
+  require build::mysql::logs
 
   file { '/etc/mysql/my.cnf':
     ensure => present,
diff --git a/src/mysql/build/modules/build/manifests/mysql/logs.pp b/src/mysql/build/modules/build/manifests/mysql/logs.pp
@@ -0,0 +1,15 @@
+class build::mysql::logs {
+  require build::mysql::packages
+
+  file { '/var/log/mysql/stdout.log':
+    ensure => link,
+    target => '/dev/stdout',
+    force => true
+  }
+
+  file { '/var/log/mysql/stderr.log':
+    ensure => link,
+    target => '/dev/stderr',
+    force => true
+  }
+}
diff --git a/src/mysql/build/modules/build/manifests/mysql/supervisor.pp b/src/mysql/build/modules/build/manifests/mysql/supervisor.pp
@@ -4,16 +4,4 @@
     source => 'puppet:///modules/build/etc/supervisor/conf.d/mysql.conf',
     mode => 644
   }
-
-  file { '/etc/supervisor/conf.d/mysql_stdout.conf':
-    ensure => present,
-    source => 'puppet:///modules/build/etc/supervisor/conf.d/mysql_stdout.conf',
-    mode => 644
-  }
-
-  file { '/etc/supervisor/conf.d/mysql_stderr.conf':
-    ensure => present,
-    source => 'puppet:///modules/build/etc/supervisor/conf.d/mysql_stderr.conf',
-    mode => 644
-  }
 }
diff --git a/src/mysql/run/modules/run/manifests/mysql.pp b/src/mysql/run/modules/run/manifests/mysql.pp
@@ -7,7 +7,25 @@
     include run::mysql::slow_query_log
   }
 
-  include run::mysql::long_query_time
+  if $query_cache_type {
+    include run::mysql::query_cache_type
+  }
+
+  if $max_allowed_packet {
+    include run::mysql::max_allowed_packet
+  }
+
+  if $key_buffer_size {
+    include run::mysql::key_buffer_size
+  }
+
+  if $thread_cache_size {
+    include run::mysql::thread_cache_size
+  }
+
+  if $innodb_buffer_pool_size {
+    include run::mysql::innodb_buffer_pool_size
+  }
 
   bash_exec { 'mkdir -p /mysql/data': }
 }
diff --git a/src/mysql/run/modules/run/manifests/mysql/innodb_buffer_pool_size.pp b/src/mysql/run/modules/run/manifests/mysql/innodb_buffer_pool_size.pp
@@ -0,0 +1,7 @@
+class run::mysql::innodb_buffer_pool_size {
+  file { '/etc/mysql/conf.d/innodb_buffer_pool_size.cnf':
+    ensure => present,
+    content => template('run/innodb_buffer_pool_size.cnf.erb'),
+    mode => 644
+  }
+}
diff --git a/src/mysql/run/modules/run/manifests/mysql/key_buffer_size.pp b/src/mysql/run/modules/run/manifests/mysql/key_buffer_size.pp
@@ -0,0 +1,7 @@
+class run::mysql::key_buffer_size {
+  file { '/etc/mysql/conf.d/key_buffer_size.cnf':
+    ensure => present,
+    content => template('run/key_buffer_size.cnf.erb'),
+    mode => 644
+  }
+}
diff --git a/src/mysql/run/modules/run/manifests/mysql/long_query_time.pp b/src/mysql/run/modules/run/manifests/mysql/long_query_time.pp
diff --git a/src/mysql/run/modules/run/manifests/mysql/max_allowed_packet.pp b/src/mysql/run/modules/run/manifests/mysql/max_allowed_packet.pp
@@ -0,0 +1,7 @@
+class run::mysql::max_allowed_packet {
+  file { '/etc/mysql/conf.d/max_allowed_packet.cnf':
+    ensure => present,
+    content => template('run/max_allowed_packet.cnf.erb'),
+    mode => 644
+  }
+}
diff --git a/src/mysql/run/modules/run/manifests/mysql/query_cache_type.pp b/src/mysql/run/modules/run/manifests/mysql/query_cache_type.pp
@@ -0,0 +1,7 @@
+class run::mysql::query_cache_type {
+  file { '/etc/mysql/conf.d/query_cache_type.cnf':
+    ensure => present,
+    content => template('run/query_cache_type.cnf.erb'),
+    mode => 644
+  }
+}
diff --git a/src/mysql/run/modules/run/manifests/mysql/thread_cache_size.pp b/src/mysql/run/modules/run/manifests/mysql/thread_cache_size.pp
@@ -0,0 +1,7 @@
+class run::mysql::thread_cache_size {
+  file { '/etc/mysql/conf.d/thread_cache_size.cnf':
+    ensure => present,
+    content => template('run/thread_cache_size.cnf.erb'),
+    mode => 644
+  }
+}
diff --git a/src/mysql/run/modules/run/templates/innodb_buffer_pool_size.cnf.erb b/src/mysql/run/modules/run/templates/innodb_buffer_pool_size.cnf.erb
@@ -0,0 +1,2 @@
+[mysqld]
+innodb_buffer_pool_size = <%= @innodb_buffer_pool_size %>
diff --git a/src/mysql/run/modules/run/templates/key_buffer_size.cnf.erb b/src/mysql/run/modules/run/templates/key_buffer_size.cnf.erb
@@ -0,0 +1,5 @@
+[mysqld]
+key_buffer_size = <%= @key_buffer_size %>
+
+[isamchk]
+key_buffer_size = <%= @key_buffer_size %>
diff --git a/src/mysql/run/modules/run/templates/long_query_time.cnf.erb b/src/mysql/run/modules/run/templates/long_query_time.cnf.erb
diff --git a/src/mysql/run/modules/run/templates/max_allowed_packet.cnf.erb b/src/mysql/run/modules/run/templates/max_allowed_packet.cnf.erb
@@ -0,0 +1,5 @@
+[mysqld]
+max_allowed_packet = <%= @max_allowed_packet %>
+
+[mysqldump]
+max_allowed_packet = <%= @max_allowed_packet %>
diff --git a/src/mysql/run/modules/run/templates/query_cache_type.cnf.erb b/src/mysql/run/modules/run/templates/query_cache_type.cnf.erb
@@ -0,0 +1,5 @@
+[mysqld]
+query_cache_type = <%= @query_cache_type %>
+query_cache_size = <%= @query_cache_size %>
+query_cache_limit = <%= @query_cache_limit %>
+query_cache_min_res_unit = <%= @query_cache_min_res_unit %>
diff --git a/src/mysql/run/modules/run/templates/slow_query_log.cnf.erb b/src/mysql/run/modules/run/templates/slow_query_log.cnf.erb
@@ -1,5 +1,4 @@
 [mysqld]
-slow-query-log = <%= @slow_query_log %>
-slow-query-log-file = /var/log/mysql/stderr.log
-long_query_time = 1
-log-queries-not-using-indexes
+slow_query_log = <%= @slow_query_log %>
+slow_query_log_file = /var/log/mysql/stderr.log
+long_query_time = <%= @long_query_time %>
diff --git a/src/mysql/run/modules/run/templates/thread_cache_size.cnf.erb b/src/mysql/run/modules/run/templates/thread_cache_size.cnf.erb
@@ -0,0 +1,2 @@
+[mysqld]
+thread_cache_size = <%= @thread_cache_size %>
diff --git a/src/mysql/variables.sh b/src/mysql/variables.sh
@@ -23,3 +23,51 @@ if [ -z "${LONG_QUERY_TIME}" ]; then
 fi
 
 export FACTER_LONG_QUERY_TIME="${LONG_QUERY_TIME}"
+
+if [ -z "${QUERY_CACHE_TYPE}" ]; then
+  QUERY_CACHE_TYPE="0"
+fi
+
+export FACTER_QUERY_CACHE_TYPE="${QUERY_CACHE_TYPE}"
+
+if [ -z "${QUERY_CACHE_SIZE}" ]; then
+  QUERY_CACHE_SIZE="1M"
+fi
+
+export FACTER_QUERY_CACHE_SIZE="${QUERY_CACHE_SIZE}"
+
+if [ -z "${QUERY_CACHE_LIMIT}" ]; then
+  QUERY_CACHE_LIMIT="1M"
+fi
+
+export FACTER_QUERY_CACHE_LIMIT="${QUERY_CACHE_LIMIT}"
+
+if [ -z "${QUERY_CACHE_MIN_RES_UNIT}" ]; then
+  QUERY_CACHE_MIN_RES_UNIT="4K"
+fi
+
+export FACTER_QUERY_CACHE_MIN_RES_UNIT="${QUERY_CACHE_MIN_RES_UNIT}"
+
+if [ -z "${MAX_ALLOWED_PACKET}" ]; then
+  MAX_ALLOWED_PACKET="16M"
+fi
+
+export FACTER_MAX_ALLOWED_PACKET="${MAX_ALLOWED_PACKET}"
+
+if [ -z "${KEY_BUFFER_SIZE}" ]; then
+  KEY_BUFFER_SIZE="16M"
+fi
+
+export FACTER_KEY_BUFFER_SIZE="${KEY_BUFFER_SIZE}"
+
+if [ -z "${THREAD_CACHE_SIZE}" ]; then
+  THREAD_CACHE_SIZE="8"
+fi
+
+export FACTER_THREAD_CACHE_SIZE="${THREAD_CACHE_SIZE}"
+
+if [ -z "${INNODB_BUFFER_POOL_SIZE}" ]; then
+  INNODB_BUFFER_POOL_SIZE="128M"
+fi
+
+export FACTER_INNODB_BUFFER_POOL_SIZE="${INNODB_BUFFER_POOL_SIZE}"
diff --git a/tools/mysqldata.sh b/tools/mysqldata.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="1.1.1"
+VERSION="1.2.0"
 
 shopt -s nullglob
 
@@ -54,7 +54,7 @@ if [ "${1}" = "backup" ]; then
         --volumes-from "${CONTAINER}" \
         -v "${WORKING_DIR}:/backup" \
         --entrypoint /bin/bash \
-        dockerizedrupal/mysql:1.1.1 -c "tar czvf /backup/${CONTAINER_NAME}.tar.gz /mysql"
+        dockerizedrupal/mysql:1.2.0 -c "tar czvf /backup/${CONTAINER_NAME}.tar.gz /mysql"
     done
   fi
 elif [ "${1}" = "restore" ]; then
@@ -66,14 +66,14 @@ elif [ "${1}" = "restore" ]; then
       -h "${CONTAINER}" \
       -v /mysql \
       --entrypoint /bin/echo \
-      dockerizedrupal/mysql:1.1.1 "Data-only container for MySQL."
+      dockerizedrupal/mysql:1.2.0 "Data-only container for MySQL."
 
     docker run \
       --rm \
       --volumes-from "${CONTAINER}" \
       -v "${WORKING_DIR}:/backup" \
       --entrypoint /bin/bash \
-      dockerizedrupal/mysql:1.1.1 -c "tar xzvf /backup/${CONTAINER}.tar.gz"
+      dockerizedrupal/mysql:1.2.0 -c "tar xzvf /backup/${CONTAINER}.tar.gz"
   done
 else
   unknown_command

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = "1.1.1"`
	`1`	`+VERSION = "1.2.0"`
`2`	`2`
`3`	`3`	`require 'yaml'`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "docker-mysql",`
`3`		`- "version": "1.1.1",`
	`3`	`+ "version": "1.2.0",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/dockerizedrupal/docker-mysql.git"`