Merge branch 'release/2.3.4'

Author: mblaschke

CHANGELOG.md

@@ -1,8 +1,10 @@
 CliTools Changelog
 ==================
 
-next - UPCOMING
+2.3.4 - 2016-03-31
 ------------------
+- Implement docker container name fetching by using docker-compose
+- Implement docker exec without needing sudo
 
 2.3.3 - 2016-03-03
 ------------------

README.md

@@ -1,6 +1,6 @@
 # CliTools for Docker, PHP und MySQL development
 
-[![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)
+[![latest v2.3.4](https://img.shields.io/badge/latest-v2.3.4-green.svg?style=flat)](https://github.com/webdevops/clitools/releases/tag/2.3.4)
 [![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

@@ -184,10 +184,11 @@ protected function checkIfDockerContainerIsAvailable($containerName)
      *
      * @param  string                  $containerName Container name
      * @param  CommandBuilderInterface $comamnd       Command
+     * @param  callback|null           $dockerCommandCallback   Docker command callback
      *
      * @return int|null|void
      */
-    protected function executeDockerExec($containerName, CommandBuilderInterface $command)
+    protected function executeDockerExec($containerName, CommandBuilderInterface $command, callable $dockerCommandCallback = null)
     {
         if (empty($containerName)) {
             $this->output->writeln('<p-error>No container specified</p-error>');
@@ -216,7 +217,12 @@ protected function executeDockerExec($containerName, CommandBuilderInterface $co
                 ) . '" in docker container "' . $dockerContainerName . '" ...</info>'
             );
 
-            $dockerCommand = new CommandBuilder('docker', 'exec -ti %s', array($dockerContainerName));
+            $dockerCommand = new CommandBuilder('docker', 'exec -ti');
+            if ($dockerCommandCallback) {
+                $dockerCommandCallback($dockerCommand);
+            }
+            $dockerCommand->addArgument($dockerContainerName);
+
             $dockerCommand->append($command, false);
             $dockerCommand->executeInteractive();
         } else {
@@ -296,7 +302,8 @@ protected function executeDockerComposeRun($containerName, CommandBuilderInterfa
      * @param null $containerName Poissible Container name (csv)
      * @return null|string
      */
-    protected function findAndBuildContainerName($containerName = null) {
+    protected function findAndBuildContainerName($containerName = null)
+    {
         // Use cached container name
         if (isset($this->runningContainerCache[$containerName])) {
             return $this->runningContainerCache[$containerName];
@@ -305,16 +312,27 @@ protected function findAndBuildContainerName($containerName = null) {
         $fullContainerName = null;
 
         $path = $this->getDockerPath();
-        $instancePrefix = \CliTools\Utility\DockerUtility::getDockerInstancePrefix($path);
+        $oldPath = getcwd();
+
+        chdir($path);
 
         $containerNameList = PhpUtility::trimExplode(',', $containerName);
         foreach ($containerNameList as $containerNameToTry) {
-            if ($this->checkIfDockerContainerIsAvailable($containerNameToTry, 'id')) {
-                $fullContainerName = $instancePrefix . '_' . $containerNameToTry . '_1';
+            try {
+                $command = new CommandBuilder('docker-compose');
+                $command
+                    ->addArgumentTemplate('ps -q %s', $containerNameToTry)
+                    ->setOutputRedirect(CommandBuilder::OUTPUT_REDIRECT_NO_STDERR);
+                $fullContainerName = $command->execute()->getOutputString();
                 break;
+            } catch (\Exception $e) {
+                // container not running
+                continue;
             }
         }
 
+        chdir($oldPath);
+
         if (empty($fullContainerName)) {
             throw new \RuntimeException('No running docker container found, tried: ' . implode(', ', $containerNameList));
         }

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

@@ -21,6 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use CliTools\Shell\CommandBuilder\CommandBuilder;
 use CliTools\Shell\CommandBuilder\RemoteCommandBuilder;
 use CliTools\Utility\PhpUtility;
 use Symfony\Component\Console\Input\InputInterface;
@@ -86,14 +87,16 @@ public function execute(InputInterface $input, OutputInterface $output)
                 $command->parse($cliScript)
                         ->addArgumentList($paramList);
 
+                $dockerCommandCallback = null;
+
                 if (!empty($cliUser)) {
-                    // sudo wrapping as cli user
-                    $commandSudo = new RemoteCommandBuilder('sudo', '-H -E -u %s', array($cliUser));
-                    $commandSudo->append($command, false);
-                    $command = $commandSudo;
+                    // Run script as specific user
+                    $dockerCommandCallback = function(CommandBuilder $command) use ($cliUser) {
+                        $command->addArgumentTemplate('-u %s', $cliUser);
+                    };
                 }
 
-                $this->executeDockerExec($container, $command);
+                $this->executeDockerExec($container, $command, $dockerCommandCallback);
                 break;
 
             ###########################

src/command.php

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