Merge branch 'release/2.1.0'

Author: Matthias Walter

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## next
 
+## 2.0.1
+
+- detect host:port combination in db-host parameter (HEAD -> develop, origin/develop)
+
+## 2.0.0
+
+- update to robo-magento2 2.0.0
 - more documentation for commands
     - deploy
     - deploy:magento-setup

src/Robo/RoboTasks.php

@@ -464,8 +464,21 @@ protected function taskMysqlCommand()
         $dbUser = $this->config(CONFIG::KEY_BUILD . '/' . Config::KEY_DB . '/db-user');
         $dbPass = $this->config(CONFIG::KEY_BUILD . '/' . Config::KEY_DB . '/db-password');
 
+        $hostParts = explode(':', $dbHost);
+        $dbPort = null;
+        if (count($hostParts) === 2) {
+            $dbPort = array_pop($hostParts);
+            $dbHost = array_pop($hostParts);
+        }
+
         $createDatabase = $this->taskExec($mysqlBin);
+
         $createDatabase->option('-h', $dbHost);
+
+        if ($dbPort !== null) {
+            $createDatabase->option('-P', $dbPort);
+        }
+
         $createDatabase->option('-u', $dbUser);
         if ($dbPass) {
             $createDatabase->option("-p$dbPass");