Use sudo to copy mysql config files, fixes #1541 (#1563)

containers/ddev-dbserver/10.1/files/docker-entrypoint.sh

@@ -55,8 +55,8 @@ sudo chown -R "$UID:$(id -g)" /var/lib/mysql
 
 # If we have extra mariadb cnf files,, copy them to where they go.
 if [ -d /mnt/ddev_config/mysql -a "$(echo /mnt/ddev_config/mysql/*.cnf)" != "/mnt/ddev_config/mysql/*.cnf" ] ; then
-  cp /mnt/ddev_config/mysql/*.cnf /etc/mysql/conf.d
-  chmod ugo-w /etc/mysql/conf.d/*
+  sudo cp /mnt/ddev_config/mysql/*.cnf /etc/mysql/conf.d
+  sudo chmod -R ugo-w /etc/mysql/conf.d
 fi
 
 # If mariadb has not been initialized, copy in the base image from either the default starter image (/var/tmp/mysqlbase)

containers/ddev-dbserver/10.2/files/docker-entrypoint.sh

@@ -41,8 +41,8 @@ sudo chown -R "$UID:$(id -g)" /var/lib/mysql
 
 # If we have extra mariadb cnf files,, copy them to where they go.
 if [ -d /mnt/ddev_config/mysql -a "$(echo /mnt/ddev_config/mysql/*.cnf)" != "/mnt/ddev_config/mysql/*.cnf" ] ; then
-  cp /mnt/ddev_config/mysql/*.cnf /etc/mysql/conf.d
-  chmod ugo-w /etc/mysql/conf.d/*
+  sudo cp /mnt/ddev_config/mysql/*.cnf /etc/mysql/conf.d
+  sudo chmod -R ugo-w /etc/mysql/conf.d
 fi
 
 # If mariadb has not been initialized, copy in the base image from either the default starter image (/var/tmp/mysqlbase)

pkg/version/version.go

@@ -51,7 +51,7 @@ var WebTag = "20190420_fix_apache_cgi" // Note that this can be overridden by ma
 var DBImg = "drud/ddev-dbserver"
 
 // BaseDBTag is the main tag, DBTag is constructed from it
-var BaseDBTag = "20190329_maria_logs_config"
+var BaseDBTag = "20190501_fix_mariadb_override_restart_problem"
 
 // DBAImg defines the default phpmyadmin image tag used for applications.
 var DBAImg = "drud/phpmyadmin"