Merge pull request #20 from linuxserver/rebase_ubuntu_bionic

rebase to ubuntu bionic and use 10.3 repository

Author: sparklyballs

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/ubuntu:xenial
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
@@ -12,11 +12,18 @@ ENV MYSQL_DIR="/config"
 ENV DATADIR=$MYSQL_DIR/databases
 
 RUN \
- echo "**** add mariadb repository ****" && \
-  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 && \
- echo "**** install packages ****" && \
+ echo "**** install gnupg ****" && \
+ apt-get update && \
+ apt-get install -y \
+	gnupg && \
+ echo "add mariadb repository ****" && \
+ echo "(redundant on armhf platform, but added for consistent dockerfile on all platforms) ****" && \
+ apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
+ echo "deb http://mirror.sax.uk.as61049.net/mariadb/repo/10.3/ubuntu bionic main" >> \
+	/etc/apt/sources.list.d/mariadb.list && \
+ echo "deb-src http://mirror.sax.uk.as61049.net/mariadb/repo/10.3/ubuntu bionic main" >> \
+	/etc/apt/sources.list.d/mariadb.list && \
+ echo "**** install runtime packages ****" && \
  apt-get update && \
  apt-get install -y \
 	mariadb-server && \

README.md

@@ -89,6 +89,7 @@ Find custom.cnf in /config for config changes (restart container for them to tak
 
 ## Versions
 
++ **10.09.18:** Rebase to ubuntu bionic and use 10.3 mariadb repository.
 + **09.12.17:** Fix continuation lines.
 + **12.09.17:** Gracefully shut down mariadb
 + **27.10.16:** Implement linting suggestions on database init script.

root/etc/cont-init.d/30_config

@@ -6,12 +6,17 @@ mkdir -p \
 	/config/log/mysql \
 	/var/run/mysqld
 
+if [ -e /etc/mysql/mariadb.conf.d/50-server.cnf ]; then \
+	CONF_FILE="/etc/mysql/mariadb.conf.d/50-server.cnf";
+ else CONF_FILE="/etc/mysql/my.cnf"; 
+fi
+
 # 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/key_buffer\b/key_buffer_size/g' "$CONF_FILE"
+sed -ri 's/^(bind-address|skip-networking)/;\1/' "$CONF_FILE"
+sed -i s#/var/log/mysql#/config/log/mysql#g "$CONF_FILE"
+sed -i -e 's/\(user.*=\).*/\1 abc/g' "$CONF_FILE"
+sed -i -e "s#\\(datadir.*=\\).*#\\1 $DATADIR#g" "$CONF_FILE"
 sed -i "s/user='mysql'/user='abc'/g" /usr/bin/mysqld_safe
 
 # setup custom cnf file