Add a .mysql8 stopfile and automaticly use the mysql 8

client and database

Author: JeroenBoersma

bin/dev

@@ -222,29 +222,41 @@ dc() {
     }
 
     php() {
-        local available="`php_versions`";
+        local PHP=$(stopfile "`php_versions`")
+
+        if [ -z "${PHP}" ]; then
+            return 1;
+        else
+            DEV_PHP=${PHP};
+        fi
+
+        return 0;
+    }
+
+    stopfile() {
+        local available="$1" project=${DEV_WORKSPACE_PATH}/${DEV_PROJECTPATH};
+
+        # check if stopfile can be found in this directory
         check() {
-            local base=$1;
+            local a;
             for a in ${available}; do
-                if [ -e ${base}/.${a} ]; then
-                    DEV_PHP=${a};
+                if [ -e $1/.$a ]; then
+                    echo $a;
                     return 0;
                 fi
             done
 
             return 1;
         }
 
-        local project=${DEV_WORKSPACE_PATH}/${DEV_PROJECTPATH};
         if [ -n "${DEV_PROJECTPATH}" ]; then
             while [ "${project}" != "${DEV_WORKSPACE_PATH}" ]; do
                 check ${project} && return 0;
                 project=$(dirname ${project});
             done
         fi
 
-        check ${DEV_WORKSPACE_PATH} && return 0;
-        return 1;
+        check ${DEV_WORKSPACE_PATH} && return 0 || return 1;
     }
 
     env() {

bin/dev_command/myroot

@@ -7,7 +7,15 @@ dc nodeps;
 dc interactive;
 dc ignore_orphans;
 
-dc cmd mysql "-hdb -uroot -p${MYSQL_ROOT_PASSWORD}";
+
+if dc stopfile mysql8 >/dev/null; then
+    dc yml build/dist/docker-compose-db8client.yml;
+    dc cmd mysql "-hdb8 -uroot -p${MYSQL_ROOT_PASSWORD}";
+else
+    dc yml build/dist/docker-compose-dbclient.yml;
+    dc cmd mysql "-hdb -uroot -p${MYSQL_ROOT_PASSWORD}";
+fi
+
 dc run "$@";
 return $?;
 

bin/dev_command/mysql

@@ -1,13 +1,17 @@
 
-dc yml build/dist/docker-compose-dbclient.yml;
-
 dc service dbclient;
 
 dc nodeps;
 dc interactive;
 dc ignore_orphans;
 
-dc cmd mysql "-h db -u ${USER}";
+if dc stopfile mysql8 >/dev/null; then
+    dc yml build/dist/docker-compose-db8client.yml;
+    dc cmd mysql "-h db8 -u ${USER}";
+else
+    dc yml build/dist/docker-compose-dbclient.yml;
+    dc cmd mysql "-h db -u ${USER}";
+fi
 
 dc run "$@";
 return $?;

build/dist/docker-compose-db8client.yml

@@ -0,0 +1,3 @@
+services:
+  dbclient:
+    image: percona:8