Merge pull request #11 from linuxserver/xenial

Xenial rebase

Author: j0nnymoe

Dockerfile

@@ -1,36 +1,37 @@
-# set base os
-FROM linuxserver/baseimage
+FROM lsiobase/xenial
+MAINTAINER sparklyballs
 
-MAINTAINER Sparklyballs  <[email protected]>
-
-# set some environment variables for mariadb to give us our paths
-ENV INSTALL_LIST="mariadb-server mysqltuner"
+# environment variables
+ARG DEBIAN_FRONTEND="noninteractive"
 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.1
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
 # update apt and install packages
-RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
-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 && \
+RUN \
+ apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
+ echo "deb [arch=amd64,i386] http://mirrors.coreix.net/mariadb/repo/10.1/ubuntu xenial main" >> /etc/apt/sources.list.d/mariadb.list && \
+ echo "deb-src http://mirrors.coreix.net/mariadb/repo/10.1/ubuntu xenial main" >> /etc/apt/sources.list.d/mariadb.list && \
+ apt-get update && \
+ apt-get install -y \
+	mariadb-server && \
 
 # cleanup
-apt-get clean -y && \
-rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/mysql && \
-mkdir -p /var/lib/mysql
-
-#Adding Custom files
-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
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/lib/mysql \
+	/var/tmp/* && \
+ mkdir -p \
+	/var/lib/mysql
+
+# add local files
+COPY root/ /
+
+# ports and volumes
 EXPOSE 3306
-
-
+VOLUME /config

README.md

@@ -1,13 +1,23 @@
-![https://linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)
+[linuxserverurl]: https://linuxserver.io
+[forumurl]: https://forum.linuxserver.io
+[ircurl]: https://www.linuxserver.io/irc/
+[podcasturl]: https://www.linuxserver.io/podcast/
 
-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/irc/) on freenode at `#linuxserver.io`
-* [Podcast](https://www.linuxserver.io/podcast/) covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at:
+* [forum.linuxserver.io][forumurl]
+* [IRC][ircurl] on freenode at `#linuxserver.io`
+* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
 # linuxserver/mariadb
+[![](https://images.microbadger.com/badges/version/linuxserver/mariadb.svg)](https://microbadger.com/images/linuxserver/mariadb "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/mariadb.svg)](http://microbadger.com/images/linuxserver/mariadb "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/mariadb.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/mariadb.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-mariadb)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-mariadb/)
+[hub]: https://hub.docker.com/r/linuxserver/mariadb/
+
+One of the most popular database servers. Made by the original developers of MySQL
 
-![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mariadb-git.png)
+[![mariadb](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mariadb-git.png)][mariaurl]
+[mariaurl]: https://mariadb.org/
 
 ## Usage
 
@@ -18,6 +28,7 @@ docker create \
 -e PUID=<UID> \
 -e PGID=<GID> \
 -e MYSQL_ROOT_PASSWORD=<DATABASE PASSWORD> \
+-e TZ=<timezone> \
 -v </path/to/appdata>:/config \
 linuxserver/mariadb
 ```
@@ -29,6 +40,9 @@ linuxserver/mariadb
 * `-e MYSQL_ROOT_PASSWORD` - set this to root password for installation (minimum 4 characters)
 * `-e PGID` for GroupID - see below for explanation
 * `-e PUID` for UserID - see below for explanation
+* `-e TZ` - for timezone information *eg Europe/London, etc*
+
+It is based on ubuntu xenial with s6 overlay, for shell access whilst the container is running do `docker exec -it mariadb /bin/bash`.
 
 ### User / Group Identifiers
 
@@ -43,25 +57,25 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
 
 ## 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 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
+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...
 
-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.
+NOTE changing the MYSQL_ROOT_PASSWORD variable after the container has set up the initial databases has no effect, use the mysqladmin tool to change your mariadb password. 
 
+Unraid users, it is advisable to edit the template/webui after setup and remove reference to this variable.
 
+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
 
-## Logs and Shell
+## Info
 
 * 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`
-
-
+* container version number `docker inspect -f '{{ index .Config.Labels "build_version" }}' mariadb`
+* image version number `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/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. 
-
++ **11.10.16:** Rebase to ubuntu xenial, add version labelling.
++ **09.03.16:** 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.16:** Change user of mysqld_safe script to abc, better unclean shutdown handling on restart.
++ **23.12.15:** Remove autoupdating, between some version updates the container breaks
++ **12.08.15:** Initial Release.

defaults/my.cnf renamed to root/defaults/my.cnf

@@ -1,7 +1,10 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
 
 # make folders if required
-mkdir -p "$DATADIR" /var/run/mysqld /config/log/mysql
+mkdir -p \
+	"$DATADIR" \
+	/config/log/mysql \
+	/var/run/mysqld
 
 # configure my.cnf and mysqld_safe
 sed -i 's/key_buffer\b/key_buffer_size/g' /etc/mysql/my.cnf
@@ -12,9 +15,15 @@ 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
+[[ ! -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
+[[ -e /etc/mysql/debian.cnf ]] && \
+	(chown abc:abc /etc/mysql/debian.cnf && chmod 644 /etc/mysql/debian.cnf)
+chmod -R 777 \
+	/var/run/mysqld

init/30_config.sh renamed to root/etc/cont-init.d/30_config

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
+
 # set start function that creates user and password, used later
 start_mysql(){
 mysqld --init-file="$tempSqlFile" &
@@ -68,7 +69,7 @@ echo "Database Setup Completed"
 
 # display a message about password if not set or too short
 if [ "$TEST_LEN" -lt "4" ]; then
-less /tmp/no-pass.nfo
+echo "$(cat /tmp/no-pass.nfo)"
 sleep 5s
 fi
 
@@ -90,4 +91,3 @@ rm /tmp/mysql-first-time.sql
 fi
 
 chown -R abc:abc /config
-

init/40_set_up_dbase.sh renamed to root/etc/cont-init.d/40-initialise-db

@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+ exec \
+	s6-setuidgid abc /usr/bin/mysqld_safe