Add logs and restart call to API

joelwurtz · joelwurtz · commit 3c3ca70f6d9d · 2014-11-30T01:06:30.000+01:00
diff --git a/src/Docker/Container.php b/src/Docker/Container.php
@@ -335,8 +335,14 @@ public function setImage($image)
     public function getImage()
     {
         if (!$this->image instanceof Image) {
-            $this->image = new Image();
-            $this->image->setName($this->config['Image']);
+            $repository = $this->config['Image'];
+            $tag        = 'latest';
+
+            if (preg_match('/:/', $this->config['Image'])) {
+                list($repository, $tag) = explode(':', $this->config['Image']);
+            }
+
+            $this->image = new Image($repository, $tag);
         }
 
         return $this->image;
diff --git a/src/Docker/Manager/ContainerManager.php b/src/Docker/Manager/ContainerManager.php
@@ -334,7 +334,7 @@ public function stop(Container $container, $timeout = 5)
             'wait' => true,
         ]]);
 
-        if ($response->getStatusCode() !== "204") {
+        if ($response->getStatusCode() !== "204" && $response->getStatusCode() !== "304") {
             throw UnexpectedStatusCodeException::fromResponse($response);
         }
 
@@ -444,4 +444,61 @@ public function export(Container $container)
 
         return $response->getBody();
     }
+
+    /**
+     * Get logs from a container
+     *
+     * @param Container $container
+     * @param bool $follow
+     * @param bool $stdout
+     * @param bool $stderr
+     * @param bool $timestamp
+     * @param string $tail
+     *
+     * @return array
+     */
+    public function logs(Container $container, $follow = false, $stdout = false, $stderr = false, $timestamp = false, $tail = "all")
+    {
+        $logs = array();
+
+        $callback = function ($output, $type) use(&$logs) {
+            $logs[] = array('type' => $type, 'output' => $output);
+        };
+
+        $this->client->get(['/containers/{id}/logs{?data*}', [
+            'id' => $container->getId(),
+            'data' => [
+                'follow' => (int)$follow,
+                'stdout' => (int)$stdout,
+                'stderr' => (int)$stderr,
+                'timestamps' => (int)$timestamp,
+                'tail' => $tail,
+            ],
+        ]], [
+            'callback' => $callback,
+            'wait'     => true,
+        ]);
+
+        return $logs;
+    }
+
+    /**
+     * Restart a container
+     *
+     * @param Container $container
+     * @param integer   $timeBeforeKill number of seconds to wait before killing the container
+     *
+     * @throws \Docker\Exception\UnexpectedStatusCodeException
+     */
+    public function restart(Container $container, $timeBeforeKill = 5)
+    {
+        $response = $this->client->post(['/containers/{id}/restart?t={time}', [
+            'id' => $container->getId(),
+            'time' => $timeBeforeKill
+        ]]);
+
+        if ($response->getStatusCode() !== "204") {
+            throw UnexpectedStatusCodeException::fromResponse($response);
+        }
+    }
 }
diff --git a/src/Docker/Tests/Manager/ContainerManagerTest.php b/src/Docker/Tests/Manager/ContainerManagerTest.php
@@ -3,6 +3,7 @@
 namespace Docker\Tests\Manager;
 
 use Docker\Container;
+use Docker\Context\ContextBuilder;
 use Docker\Port;
 use Docker\Tests\TestCase;
 use GuzzleHttp\Exception\RequestException;
@@ -409,4 +410,52 @@ public function testExport()
         unlink($tarFileName);
         $manager->remove($container);
     }
+
+    public function testLogs()
+    {
+        $container = new Container(['Image' => 'ubuntu:precise', 'Cmd' => ['echo', 'test']]);
+        $manager = $this->getManager();
+        $manager->run($container);
+        $manager->stop($container);
+        $logs = $manager->logs($container, false, true);
+        $manager->remove($container);
+
+        $this->assertGreaterThanOrEqual(1, count($logs));
+
+        $logs = array_map(function ($value) {
+            return $value['output'];
+        }, $logs);
+
+        $this->assertContains("test", implode("", $logs));
+    }
+
+    public function testRestart()
+    {
+        $manager = $this->getManager();
+        $dockerFileBuilder = new ContextBuilder();
+        $dockerFileBuilder->from('ubuntu:precise');
+        $dockerFileBuilder->add('/daemon.sh', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'script' . DIRECTORY_SEPARATOR . 'daemon.sh'));
+        $dockerFileBuilder->run('chmod +x /daemon.sh');
+
+        $this->getDocker()->build($dockerFileBuilder->getContext(), 'docker-php-restart-test', null, true, false, true);
+
+        $container = new Container(['Image' => 'docker-php-restart-test', 'Cmd' => ['/daemon.sh']]);
+        $manager->create($container);
+        $manager->start($container);
+        $manager->restart($container);
+
+        $logs = $manager->logs($container, false, true);
+        $logs = array_map(function ($value) {
+            return $value['output'];
+        }, $logs);
+        $processes = $manager->top($container);
+
+        $manager->stop($container);
+        $manager->remove($container);
+
+        $this->getDocker()->getImageManager()->delete($container->getImage());
+
+        $this->assertCount(2, $processes);
+        $this->assertContains('test', implode("", $logs));
+    }
 }
diff --git a/src/Docker/Tests/Manager/script/daemon.sh b/src/Docker/Tests/Manager/script/daemon.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+terminate() {
+  echo "test"
+  exit 0
+}
+
+trap terminate SIGHUP SIGINT SIGTERM
+
+while true; do
+  sleep 1000 & wait
+done
