Merge pull request #50 from DrupalStand/mariadb-container-fix

Mariadb container fix

Author: smfsh

docker-src/db/Dockerfile

@@ -4,9 +4,11 @@ LABEL maintainer="DrupalStand"
 RUN apk --no-cache add --update mariadb mariadb-client pwgen
 
 ADD files/run.sh /scripts/run.sh
-ADD conf/map.cnf /etc/mysql/conf.d/map.cnf
+ADD conf/map.cnf /etc/my.cnf.d/map.cnf
 
-RUN mkdir /scripts/pre-exec.d && \
+# Comment out skip-networking
+RUN sed -e '/skip-networking/ s/^#*/#/' -i /etc/my.cnf.d/mariadb-server.cnf && \
+    mkdir /scripts/pre-exec.d && \
     mkdir /scripts/pre-init.d && \
     chmod -R 755 /scripts
 

docker-src/db/files/run.sh

@@ -25,7 +25,7 @@ else
 
 	chown -R mysql:mysql /var/lib/mysql
 
-	mysql_install_db --user=mysql > /dev/null
+	mysql_install_db --user=mysql --datadir=/var/lib/mysql > /dev/null
 
 	if [ "$MYSQL_ROOT_PASSWORD" = "" ]; then
 		MYSQL_ROOT_PASSWORD=`pwgen 16 1`