Merge pull request #4 from sparklyballs/master

Switch to 10.1 repository and other changes.

Author: lonix

Dockerfile

@@ -9,11 +9,11 @@ ENV MYSQL_DIR="/config"
 ENV DATADIR=$MYSQL_DIR/databases
 
 # set the repo version for mariadb choose between 5.5 or 10.0
-ENV REPO_VER 10.0
+ENV REPO_VER 10.1
 
 # update apt and install packages
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
-add-apt-repository "deb http://mirrors.coreix.net/mariadb/repo/$REPO_VER/ubuntu trusty main" && \
+echo "deb [arch=amd64,i386] http://lon1.mirrors.digitalocean.com/mariadb/repo/${REPO_VER}/ubuntu trusty main" >> /etc/apt/sources.list.d/mariadb.list && \
 apt-get update && \
 apt-get install \
 $INSTALL_LIST -qy && \
@@ -23,21 +23,14 @@ apt-get clean -y && \
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/mysql && \
 mkdir -p /var/lib/mysql
 
-# configure mariadb
-RUN sed -i 's/key_buffer\b/key_buffer_size/g' /etc/mysql/my.cnf && \
-sed -ri 's/^(bind-address|skip-networking)/;\1/' /etc/mysql/my.cnf && \
-sed -i s#/var/log/mysql#/config/log/mysql#g /etc/mysql/my.cnf && \
-sed -i -e 's/\(user.*=\).*/\1 abc/g' /etc/mysql/my.cnf && \
-sed -i -e "s#\(datadir.*=\).*#\1 $DATADIR#g" /etc/mysql/my.cnf && \
-sed -i "s/user='mysql'/user='abc'/g" /usr/bin/mysqld_safe && \
-cp /etc/mysql/my.cnf /defaults/my.cnf
-
 #Adding Custom files
-ADD init/ /etc/my_init.d/
-ADD services/ /etc/service/
+COPY defaults/ /defaults/
+COPY init/ /etc/my_init.d/
+COPY services/ /etc/service/
 RUN chmod -v +x /etc/service/*/run /etc/my_init.d/*.sh
 
 # set volumes and ports
 VOLUME /config
 EXPOSE 3306
 
+

README.md

@@ -1,10 +1,13 @@
 ![https://linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)
 
-The [LinuxServer.io](https://linuxserver.io) team brings you another quality container release featuring easy user mapping and community support. Be sure to checkout our [forums](https://forum.linuxserver.io) or for real-time support our [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`.
+The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring easy user mapping and community support. Find us for support at:
+* [forum.linuxserver.io](https://forum.linuxserver.io)
+* [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`
+* [Podcast](https://www.linuxserver.io/index.php/category/podcast/) covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
 # linuxserver/mariadb
 
-
+![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mariadb-git.png)
 
 ## Usage
 
@@ -27,31 +30,38 @@ linuxserver/mariadb
 * `-e PGID` for GroupID - see below for explanation
 * `-e PUID` for UserID - see below for explanation
 
-It is based on phusion-baseimage with ssh removed, for shell access whilst the container is running do `docker exec -it mariadb /bin/bash`.
-
 ### User / Group Identifiers
 
-**TL;DR** - The `PGID` and `PUID` values set the user / group you'd like your container to 'run as' to the host OS. This can be a user you've created or even root (not recommended).
+Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™.
+
+In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below:
 
-Part of what makes our containers work so well is by allowing you to specify your own `PUID` and `PGID`. This avoids nasty permissions errors with relation to data volumes (`-v` flags). When an application is installed on the host OS it is normally added to the common group called users, Docker apps due to the nature of the technology can't be added to this group. So we added this feature to let you easily choose when running your containers.
+```
+  $ id <dockeruser>
+    uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
+```
 
 ## Setting up the application 
 
 If you didn't set a password during installation, (see logs for warning) use mysqladmin -u root password <PASSWORD> to set one at the docker prompt... NOTE changing the MYSQL_ROOT_PASSWORD variable after the container has set up the initial databases has no effect. It is also advisable to edit the run command or template/webui after setup and remove reference to this variable.
 
-Find my.cnf in /config, the databases in /config/databases and the log in /config/log/myqsl
+Find custom.cnf in /config for config changes (restart container for them to take effect)
+, the databases in /config/databases and the log in /config/log/myqsl
 
 The container also has mysqltuner included which can either be run from within the container by exec'ing in or externally by issuing `docker exec -it mariadb mysqltuner`. It will prompt for credentials if you have set a password for root user.
 
 
 
-## Logs
+## Logs and Shell
 
-* To monitor the logs of the container in realtime `docker logs -f mariadb`.
+* Shell access whilst the container is running: `docker exec -it mariadb /bin/bash`
+* To monitor the logs of the container in realtime: `docker logs -f mariadb`
 
 
 
 ## Versions
++ **09.03.2016:** Update to mariadb 10.1. Change to use custom.cnf over my.cnf in /config. Restructured init files to change config options on startup, rather than in the dockerfile.
 + **26.01.2016:** Change user of mysqld_safe script to abc, better unclean shutdown handling on restart.
 + **23.12.2015:** Remove autoupdating, between some version updates the container breaks
 + **12.08.2015:** Initial Release. 
+

defaults/my.cnf

@@ -0,0 +1,142 @@
+## custom configuration file, please be aware that changing options here may break things
+
+[mysqld_safe]
+nice		= 0
+
+[mysqld]
+max_connections		= 100
+connect_timeout		= 5
+wait_timeout		= 600
+max_allowed_packet	= 16M
+thread_cache_size       = 128
+sort_buffer_size	= 4M
+bulk_insert_buffer_size	= 16M
+tmp_table_size		= 32M
+max_heap_table_size	= 32M
+#
+# * MyISAM
+#
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched. On error, make copy and try a repair.
+myisam_recover_options = BACKUP
+key_buffer_size		= 128M
+#open-files-limit	= 2000
+table_open_cache	= 400
+myisam_sort_buffer_size	= 512M
+concurrent_insert	= 2
+read_buffer_size	= 2M
+read_rnd_buffer_size	= 1M
+#
+# * Query Cache Configuration
+#
+# Cache only tiny result sets, so we can fit more in the query cache.
+query_cache_limit		= 128K
+query_cache_size		= 64M
+# for more write intensive setups, set to DEMAND or OFF
+#query_cache_type		= DEMAND
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /config/log/mysql/mysql.log
+#general_log             = 1
+#
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
+#
+# we do want to know about network errors and such
+log_warnings		= 2
+#
+# Enable the slow query log to see queries with especially long duration
+#slow_query_log[={0|1}]
+slow_query_log_file	= /config/log/mysql/mariadb-slow.log
+long_query_time = 10
+#log_slow_rate_limit	= 1000
+log_slow_verbosity	= query_plan
+
+#log-queries-not-using-indexes
+#log_slow_admin_statements
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id		= 1
+#report_host		= master1
+#auto_increment_increment = 2
+#auto_increment_offset	= 1
+log_bin			= /config/log/mysql/mariadb-bin
+log_bin_index		= /config/log/mysql/mariadb-bin.index
+# not fab for performance, but safer
+#sync_binlog		= 1
+expire_logs_days	= 10
+max_binlog_size         = 100M
+# slaves
+#relay_log		= /config/log/mysql/relay-bin
+#relay_log_index	= /config/log/mysql/relay-bin.index
+#relay_log_info_file	= /config/log/mysql/relay-bin.info
+#log_slave_updates
+#read_only
+#
+# If applications support it, this stricter sql_mode prevents some
+# mistakes like inserting invalid dates etc.
+#sql_mode		= NO_ENGINE_SUBSTITUTION,TRADITIONAL
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+default_storage_engine	= InnoDB
+# you can't just change log file size, requires special procedure
+#innodb_log_file_size	= 50M
+innodb_buffer_pool_size	= 256M
+innodb_log_buffer_size	= 8M
+innodb_file_per_table	= 1
+innodb_open_files	= 400
+innodb_io_capacity	= 400
+innodb_flush_method	= O_DIRECT
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+#
+# * Galera-related settings
+#
+[galera]
+# Mandatory settings
+#wsrep_on=ON
+#wsrep_provider=
+#wsrep_cluster_address=
+#binlog_format=row
+#default_storage_engine=InnoDB
+#innodb_autoinc_lock_mode=2
+#
+# Allow server to accept connections on all interfaces.
+#
+#bind-address=0.0.0.0
+#
+# Optional setting
+#wsrep_slave_threads=1
+#innodb_flush_log_at_trx_commit=0
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 16M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completion
+
+[isamchk]
+key_buffer_size		= 16M
+
+
+

init/30_config.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# make folders if required
+mkdir -p "$DATADIR" /var/run/mysqld /config/log/mysql
+
+# configure my.cnf and mysqld_safe
+sed -i 's/key_buffer\b/key_buffer_size/g' /etc/mysql/my.cnf
+sed -ri 's/^(bind-address|skip-networking)/;\1/' /etc/mysql/my.cnf
+sed -i s#/var/log/mysql#/config/log/mysql#g /etc/mysql/my.cnf
+sed -i -e 's/\(user.*=\).*/\1 abc/g' /etc/mysql/my.cnf
+sed -i -e "s#\(datadir.*=\).*#\1 $DATADIR#g" /etc/mysql/my.cnf
+sed -i "s/user='mysql'/user='abc'/g" /usr/bin/mysqld_safe
+
+# setup custom cnf file
+[[ ! -f /config/custom.cnf ]] && cp /defaults/my.cnf /config/custom.cnf
+[[ ! -L /etc/mysql/conf.d/custom.cnf && -f /etc/mysql/conf.d/custom.cnf ]] && rm /etc/mysql/conf.d/custom.cnf
+[[ ! -L /etc/mysql/conf.d/custom.cnf ]] && ln -s /config/custom.cnf /etc/mysql/conf.d/custom.cnf
+
+# set permissions
+chmod -R 777 /var/run/mysqld

init/30_set_our_folders.sh

@@ -89,3 +89,5 @@ if [ -f "/tmp/mysql-first-time.sql" ]; then
 rm /tmp/mysql-first-time.sql
 fi
 
+chown -R abc:abc /config
+