Merge branch '1.22'

joelwurtz · joelwurtz · commit ec2b05900307 · 2016-03-06T16:12:17.000+01:00
diff --git a/docker-swagger.json b/docker-swagger.json
@@ -347,6 +347,9 @@
         "Image": {
           "type": "string"
         },
+        "ImageID": {
+           "type": "string"
+        },
         "Command": {
           "type": "string"
         },
diff --git a/docs/cookbook/container-run.md b/docs/cookbook/container-run.md
@@ -9,6 +9,9 @@ First step is to create a container and its associated configuration, by creatin
 passing to the `create` api endpoint.
 
 ```php
+use Docker\Docker;                   
+use Docker\API\Model\ContainerConfig;
+
 $docker = new Docker();
 $containerManager = $docker->getContainerManager();
 
diff --git a/generated/Model/ContainerConfig.php b/generated/Model/ContainerConfig.php
@@ -16,6 +16,10 @@ class ContainerConfig
      * @var string
      */
     protected $image;
+    /**
+     * @var string
+     */
+    protected $imageID;
     /**
      * @var string
      */
@@ -181,6 +185,26 @@ public function setImage($image = null)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getImageID()
+    {
+        return $this->imageID;
+    }
+
+    /**
+     * @param string $imageID
+     *
+     * @return self
+     */
+    public function setImageID($imageID = null)
+    {
+        $this->imageID = $imageID;
+
+        return $this;
+    }
+
     /**
      * @return string
      */
diff --git a/generated/Normalizer/ContainerConfigNormalizer.php b/generated/Normalizer/ContainerConfigNormalizer.php
@@ -52,6 +52,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
         if (isset($data->{'Image'})) {
             $object->setImage($data->{'Image'});
         }
+        if (isset($data->{'ImageID'})) {
+            $object->setImageID($data->{'ImageID'});
+        }
         if (isset($data->{'Command'})) {
             $object->setCommand($data->{'Command'});
         }
@@ -192,6 +195,9 @@ public function normalize($object, $format = null, array $context = [])
         if (null !== $object->getImage()) {
             $data->{'Image'} = $object->getImage();
         }
+        if (null !== $object->getImageID()) {
+            $data->{'ImageID'} = $object->getImageID();
+        }
         if (null !== $object->getCommand()) {
             $data->{'Command'} = $object->getCommand();
         }

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,9 @@ public function denormalize($data, $class, $format = null, array $context = [])`
`52`	`52`	`if (isset($data->{'Image'})) {`
`53`	`53`	`$object->setImage($data->{'Image'});`
`54`	`54`	`}`
	`55`	`+ if (isset($data->{'ImageID'})) {`
	`56`	`+ $object->setImageID($data->{'ImageID'});`
	`57`	`+ }`
`55`	`58`	`if (isset($data->{'Command'})) {`
`56`	`59`	`$object->setCommand($data->{'Command'});`
`57`	`60`	`}`
`@@ -192,6 +195,9 @@ public function normalize($object, $format = null, array $context = [])`
`192`	`195`	`if (null !== $object->getImage()) {`
`193`	`196`	`$data->{'Image'} = $object->getImage();`
`194`	`197`	`}`
	`198`	`+ if (null !== $object->getImageID()) {`
	`199`	`+ $data->{'ImageID'} = $object->getImageID();`
	`200`	`+ }`
`195`	`201`	`if (null !== $object->getCommand()) {`
`196`	`202`	`$data->{'Command'} = $object->getCommand();`
`197`	`203`	`}`