Merge branch 'release/2.3.3'

Author: mblaschke

CHANGELOG.md

@@ -4,6 +4,10 @@ CliTools Changelog
 next - UPCOMING
 ------------------
 
+2.3.3 - 2016-03-03
+------------------
+- Added main and app containers (see `config.ini`) for `docker:exec`, `docker:shell` and `docker:cli`
+
 2.3.2 - 2016-02-18
 ------------------
 - Fixed issue which prevented deletion of orpahend docker images 

Documentation/INSTALL.md

@@ -88,7 +88,7 @@ ignore[] = "CliTools\Console\Command\System\RebootCommand"
 
 ```bash
 # Stable channel
-ct self-udpate
+ct self-update
 
 ## Beta channel
 ct self-update --beta

README.md

@@ -1,6 +1,6 @@
 # CliTools for Docker, PHP und MySQL development
 
-[![latest v2.3.2](https://img.shields.io/badge/latest-v2.3.2-green.svg?style=flat)](https://github.com/webdevops/clitools/releases/tag/2.3.2)
+[![latest v2.3.3](https://img.shields.io/badge/latest-v2.3.3-green.svg?style=flat)](https://github.com/webdevops/clitools/releases/tag/2.3.3)
 [![License GPL3](https://img.shields.io/badge/license-GPL3-blue.svg?style=flat)](/LICENSE)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/webdevops/clitools.svg)](http://isitmaintained.com/project/webdevops/clitools "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/webdevops/clitools.svg)](http://isitmaintained.com/project/webdevops/clitools "Percentage of issues still open")

src/app/CliTools/Console/Command/Docker/AbstractCommand.php

@@ -23,6 +23,7 @@
 
 use CliTools\Shell\CommandBuilder\CommandBuilder;
 use CliTools\Shell\CommandBuilder\CommandBuilderInterface;
+use CliTools\Utility\DockerUtility;
 use CliTools\Utility\PhpUtility;
 
 abstract class AbstractCommand extends \CliTools\Console\Command\AbstractCommand
@@ -35,6 +36,11 @@ abstract class AbstractCommand extends \CliTools\Console\Command\AbstractCommand
      */
     protected $dockerPath;
 
+    /**
+     * @var array
+     */
+    protected $runningContainerCache = array();
+
     /**
      * Search and return for updir docker path
      *
@@ -105,7 +111,7 @@ protected function getDockerEnv($containerName, $envName)
 
         if (!empty($path)) {
             // Genrate full docker container name
-            $dockerContainerName = \CliTools\Utility\DockerUtility::getDockerInstanceName($containerName, 1, $path);
+            $dockerContainerName = $this->findAndBuildContainerName($containerName);
 
             // Switch to directory of docker-compose.yml
             PhpUtility::chdir($path);
@@ -127,6 +133,52 @@ protected function getDockerEnv($containerName, $envName)
         return $ret;
     }
 
+    /**
+     * Check if docker container is available
+     *
+     * @param  string $containerName Container name
+     *
+     * @return string|bool|null
+     */
+    protected function checkIfDockerContainerIsAvailable($containerName)
+    {
+        $ret = null;
+
+        if (empty($containerName)) {
+            $this->output->writeln('<p-error>No container specified</p-error>');
+
+            return false;
+        }
+
+        try {
+            // Search updir for docker-compose.yml
+            $path = $this->getDockerPath();
+
+            if (!empty($path)) {
+                // Genrate full docker container name
+                $dockerContainerName = \CliTools\Utility\DockerUtility::getDockerInstanceName($containerName, 1, $path);
+
+                // Switch to directory of docker-compose.yml
+                PhpUtility::chdir($path);
+
+                // Get docker confguration (fetched directly from docker)
+                $conf = \CliTools\Utility\DockerUtility::getDockerConfiguration($dockerContainerName);
+
+                if (!empty($conf)
+                    && !empty($conf->State)
+                    && !empty($conf->State->Status)
+                    && in_array(strtolower($conf->State->Status), ['running'], true)
+                ) {
+                    $ret = true;
+                }
+            }
+        } catch (\Exception $e) {
+            $ret = false;
+        }
+
+        return $ret;
+    }
+
     /**
      * Execute docker command
      *
@@ -154,7 +206,7 @@ protected function executeDockerExec($containerName, CommandBuilderInterface $co
 
         if (!empty($path)) {
             // Genrate full docker container name
-            $dockerContainerName = \CliTools\Utility\DockerUtility::getDockerInstanceName($containerName, 1, $path);
+            $dockerContainerName = $this->findAndBuildContainerName($containerName);
 
             // Switch to directory of docker-compose.yml
             PhpUtility::chdir($path);
@@ -239,4 +291,37 @@ protected function executeDockerComposeRun($containerName, CommandBuilderInterfa
 
         return 0;
     }
+
+    /**
+     * @param null $containerName Poissible Container name (csv)
+     * @return null|string
+     */
+    protected function findAndBuildContainerName($containerName = null) {
+        // Use cached container name
+        if (isset($this->runningContainerCache[$containerName])) {
+            return $this->runningContainerCache[$containerName];
+        }
+
+        $fullContainerName = null;
+
+        $path = $this->getDockerPath();
+        $instancePrefix = \CliTools\Utility\DockerUtility::getDockerInstancePrefix($path);
+
+        $containerNameList = PhpUtility::trimExplode(',', $containerName);
+        foreach ($containerNameList as $containerNameToTry) {
+            if ($this->checkIfDockerContainerIsAvailable($containerNameToTry, 'id')) {
+                $fullContainerName = $instancePrefix . '_' . $containerNameToTry . '_1';
+                break;
+            }
+        }
+
+        if (empty($fullContainerName)) {
+            throw new \RuntimeException('No running docker container found, tried: ' . implode(', ', $containerNameList));
+        }
+
+        // Cache running container
+        $this->runningContainerCache[$containerName] = $fullContainerName;
+
+        return $fullContainerName;
+    }
 }

src/app/CliTools/Utility/DockerUtility.php

@@ -27,6 +27,13 @@
 class DockerUtility
 {
 
+    /**
+     * Docker configuration cache
+     *
+     * @var array
+     */
+    static protected $dockerConfigurationCache = array();
+
     /**
      * Parse docker configuration (from docker inspect)
      *
@@ -36,9 +43,13 @@ class DockerUtility
      */
     public static function getDockerConfiguration($container)
     {
+        // Use from cache
+        if (isset(self::$dockerConfigurationCache[$container])) {
+            return self::$dockerConfigurationCache[$container];
+        }
 
         // Build command
-        $command = new CommandBuilder('docker', 'inspect %s', array($container));
+        $command = new CommandBuilder('docker', 'inspect %s 2> /dev/null', array($container));
 
         // execute
         $executor = new Executor($command);
@@ -62,6 +73,9 @@ public static function getDockerConfiguration($container)
                 $conf->Config->Env = $envList;
             }
 
+            // store cache
+            self::$dockerConfigurationCache[$container] = $conf;
+
             return $conf;
         }
 

src/command.php

@@ -21,7 +21,7 @@
  */
 
 error_reporting(E_ALL);
-define('CLITOOLS_COMMAND_VERSION', '2.3.2');
+define('CLITOOLS_COMMAND_VERSION', '2.3.3');
 define('CLITOOLS_ROOT_FS', __DIR__);
 
 require __DIR__ . '/vendor/autoload.php';

src/composer.json

@@ -4,9 +4,9 @@
       { "type": "vcs", "url": "https://github.com/jamiebicknell/Growl-GNTP.git" }
     ],
     "require": {
-        "symfony/console": "2.*",
+        "symfony/console": "~2.8",
         "jamiebicknell/Growl-GNTP": "dev-master",
-        "symfony/yaml": "^2.6"
+        "symfony/yaml": "~2.8"
     },
     "autoload": {
         "psr-0": {

src/composer.lock

@@ -21,7 +21,7 @@ growl = 1
 diskusage = 90
 
 [docker]
-container = main
+container = main,app
 interface = docker0
 script_env_vars = CLI_SCRIPT
 user_env_vars = CLI_USER,APPLICATION_USER