Use mysql as service name in docker

Author: pentatonicfunk

config/homebin/vagrant_provision

@@ -29,10 +29,18 @@ else
 fi
 
 vvv_info " * Restarting MariaDB service"
-if sudo service mariadb status > /dev/null; then
-  sudo service mariadb restart
+if [ ! -f /.dockerenv ]; then
+  if sudo service mariadb status > /dev/null; then
+    sudo service mariadb restart
+  else
+    sudo service mariadb start
+  fi
 else
-  sudo service mariadb start
+  if sudo service mysql status > /dev/null; then
+    sudo service mysql restart
+  else
+    sudo service mysql start
+  fi
 fi
 
 if [ ! -f /.dockerenv ]; then

provision/core/mariadb/provision.sh

@@ -125,8 +125,13 @@ function mysql_setup() {
   vvv_info " * Copied /srv/provision/core/mariadb/config/debian.cnf          to /etc/mysql/debian.cnf"
 
   # Due to systemd dependencies, in docker, mysql service is not auto started
+  # also docker isn't systemd based, so thee service name is different: see: https://mariadb.com/kb/en/systemd/ vs https://mariadb.com/kb/en/sysvinit/
   vvv_info " * Ensuring MariaDB service is started"
-  service mariadb status > /dev/null || service mariadb start
+  if [ ! -f /.dockerenv ]; then
+    service mariadb status > /dev/null || service mariadb start
+  else
+    service mysql status > /dev/null || service mysql start
+  fi
 
   if [ ! -f /.dockerenv ]; then
     check_mysql_root_password
@@ -135,21 +140,40 @@ function mysql_setup() {
   # MySQL gives us an error if we restart a non running service, which
   # happens after a `vagrant halt`. Check to see if it's running before
   # deciding whether to start or restart.
-  if service mariadb status > /dev/null; then
-    vvv_info " * Restarting the mariadb service"
-    if ! service mariadb restart; then
-      vvv_error " * Restarting the MariaDB failed! Fetching service status."
-      service mariadb status
-      exit 1
-    fi
+  if [ ! -f /.dockerenv ]; then
+      if service mariadb status > /dev/null; then
+        vvv_info " * Restarting the mariadb service"
+        if ! service mariadb restart; then
+          vvv_error " * Restarting the MariaDB failed! Fetching service status."
+          service mariadb status
+          exit 1
+        fi
+      else
+        vvv_info " * Restarting mariadb service"
+        service mariadb start
+        if ! service mariadb start; then
+          vvv_error " * Starting MariaDB failed! Fetching service status."
+          service mariadb status
+          exit 1
+        fi
+      fi
   else
-    vvv_info " * Restarting mariadb service"
-    service mariadb start
-    if ! service mariadb start; then
-      vvv_error " * Starting MariaDB failed! Fetching service status."
-      service mariadb status
-      exit 1
-    fi
+      if service mysql status > /dev/null; then
+        vvv_info " * Restarting the mariadb service"
+        if ! service mysql restart; then
+          vvv_error " * Restarting the MariaDB failed! Fetching service status."
+          service mysql status
+          exit 1
+        fi
+      else
+        vvv_info " * Restarting mariadb service"
+        service mysql start
+        if ! service mysql start; then
+          vvv_error " * Starting MariaDB failed! Fetching service status."
+          service mysql status
+          exit 1
+        fi
+      fi
   fi
 
   # IMPORT SQL