Merge branch 'release/2.3.1'

Author: mblaschke

CHANGELOG.md

@@ -4,6 +4,10 @@ CliTools Changelog
 next - UPCOMING
 ------------------
 
+2.3.1 - 2016-02-14
+------------------
+- Switched to official docker volume cleanup
+- SLOC: 7,034
 
 2.3.0 - 2016-01-26
 ------------------

README.md

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

@@ -24,6 +24,7 @@
 use CliTools\Shell\CommandBuilder\CommandBuilder;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
 
 class CleanupCommand extends AbstractCommand
 {
@@ -34,7 +35,13 @@ class CleanupCommand extends AbstractCommand
     protected function configure()
     {
         $this->setName('docker:cleanup')
-            ->setDescription('Cleanup docker environment');
+            ->setDescription('Cleanup docker environment')
+            ->addOption(
+                'force',
+                'f',
+                InputOption::VALUE_NONE,
+                'Force deletion'
+            );
     }
 
     /**
@@ -59,8 +66,23 @@ protected function cleanDockerImages()
     {
         $this->output->writeln('<h2>Cleanup orphaned docker images</h2>');
         try {
-            $command = new CommandBuilder('docker', 'rmi $(docker images -qf "dangling=true")');
-            $command->executeInteractive();
+            $command = new CommandBuilder('docker', 'images -qf "dangling=true"');
+            $imageList = $command->execute()->getOutput();
+
+            if (!empty($volumeList)) {
+                $this->output->writeln('<p>Found ' . number_format(count($imageList)) . ' images for cleanup</p>');
+
+                while (!empty($imageList)) {
+                    $command = new CommandBuilder('docker', 'rmi');
+                    if ($this->input->getOption('force')) {
+                        $command->addArgument('--force');
+                    }
+                    $command->addArgumentList(array_splice($imageList, 0, 50));
+                    $command->executeInteractive();
+                }
+            } else {
+                $this->output->writeln('<p>No images for cleanup found</p>');
+            }
 
         } catch (\Exception $e) {
             $this->output->writeln('<comment>Some images could not be removed (this is normal)</comment>');
@@ -75,14 +97,28 @@ protected function cleanDockerImages()
     protected function cleanDockerVolumes()
     {
         $this->output->writeln('<h2>Cleanup orphaned docker volumes</h2>');
-        $this->output->writeln('<info>Updating docker image "martin/docker-cleanup-volumes"</info>');
 
-        $command = new CommandBuilder('docker', 'pull martin/docker-cleanup-volumes');
-        $command->executeInteractive();
+         try {
+             $command = new CommandBuilder('docker', 'volume ls -qf "dangling=true"');
+             $volumeList = $command->execute()->getOutput();
+
+             if (!empty($volumeList)) {
+                 $this->output->writeln('<p>Found ' . number_format(count($volumeList)) . ' volumes for cleanup</p>');
 
-        $this->output->writeln('<info>Run docker image "martin/docker-cleanup-volumes"</info>');
-        $command = new CommandBuilder('docker', 'run -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker --rm martin/docker-cleanup-volumes');
-        $command->executeInteractive();
+                 while (!empty($volumeList)) {
+                     $command = new CommandBuilder('docker', 'volume rm');
+                     if ($this->input->getOption('force')) {
+                         $command->addArgument('--force');
+                     }
+                     $command->addArgumentList(array_splice($volumeList, 0, 50));
+                     $command->executeInteractive();
+                 }
+             } else {
+                 $this->output->writeln('<p>No volumes for cleanup found</p>');
+             }
+         } catch (\Exception $e) {
+             $this->output->writeln('<comment>Some volumes could not be removed (this is normal)</comment>');
+         }
 
         $this->output->writeln('');
     }

src/command.php

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