Bump Docker Engine API to v1.42

Author: flavioheleno

.jane-openapi

@@ -4,7 +4,7 @@ return [
   'date-prefer-interface' => true,
   'directory'             => __DIR__ . '/src',
   'namespace'             => 'Docker\\API',
-  'openapi-file'          => __DIR__ . '/spec/v1.41.json',
+  'openapi-file'          => __DIR__ . '/spec/v1.42.json',
   'reference'             => true,
   'strict'                => false,
   'date-input-format'     => 'Y-m-d\TH:i:s.uuP',

composer.json

@@ -59,7 +59,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "7.1.41.x-dev",
+            "dev-main": "7.1.42.x-dev",
+            "7.1.41": "7.1.41.x-dev",
             "6.1.41": "6.1.41.x-dev",
             "6.1.36": "6.1.36.x-dev"
         }

spec/v1.42.json

@@ -79,7 +79,7 @@ protected function transformResponseBody(\Psr\Http\Message\ResponseInterface $re
         if (200 === $status) {
         }
         if ((null === $contentType) === false && (400 === $status && false !== mb_strpos($contentType, 'application/json'))) {
-            throw new \Docker\API\Exception\ContainerArchiveInfoBadRequestException($serializer->deserialize($body, 'Docker\\API\\Model\\ContainersIdArchiveHeadJsonResponse400', 'json'), $response);
+            throw new \Docker\API\Exception\ContainerArchiveInfoBadRequestException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);
         }
         if ((null === $contentType) === false && (404 === $status && false !== mb_strpos($contentType, 'application/json'))) {
             throw new \Docker\API\Exception\ContainerArchiveInfoNotFoundException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);

src/Client.php

@@ -64,7 +64,8 @@ class ContainerAttach extends \Docker\API\Runtime\Client\BaseEndpoint implements
      * ### Stream format
      *
      * When the TTY setting is disabled in [`POST /containers/create`](#operation/ContainerCreate),
-     * the stream over the hijacked connected is multiplexed to separate out
+     * the HTTP Content-Type header is set to application/vnd.docker.multiplexed-stream
+     * and the stream over the hijacked connected is multiplexed to separate out
      * `stdout` and `stderr`. The stream consists of a series of frames, each
      * containing a header and a payload.
      *
@@ -125,7 +126,7 @@ class ContainerAttach extends \Docker\API\Runtime\Client\BaseEndpoint implements
      * @var bool $stderr Attach to `stderr`
      *           }
      *
-     * @param array $accept Accept content header application/vnd.docker.raw-stream|application/json
+     * @param array $accept Accept content header application/vnd.docker.raw-stream|application/vnd.docker.multiplexed-stream|application/json
      */
     public function __construct(string $id, array $queryParameters = [], array $accept = [])
     {
@@ -152,7 +153,7 @@ public function getBody(\Symfony\Component\Serializer\SerializerInterface $seria
     public function getExtraHeaders(): array
     {
         if (empty($this->accept)) {
-            return ['Accept' => ['application/vnd.docker.raw-stream', 'application/json']];
+            return ['Accept' => ['application/vnd.docker.raw-stream', 'application/vnd.docker.multiplexed-stream', 'application/json']];
         }
 
         return $this->accept;

src/Endpoint/ContainerArchiveInfo.php

@@ -13,6 +13,22 @@ class ContainerCreate extends \Docker\API\Runtime\Client\BaseEndpoint implements
      *
      * @var string $name Assign the specified name to the container. Must match
      *             `/?[a-zA-Z0-9][a-zA-Z0-9_.-]+`.
+     * @var string $platform Platform in the format `os[/arch[/variant]]` used for image lookup.
+     *
+     * When specified, the daemon checks if the requested image is present
+     * in the local image cache with the given OS and Architecture, and
+     * otherwise returns a `404` status.
+     *
+     * If the option is not set, the host's native OS and Architecture are
+     * used to look up the image in the image cache. However, if no platform
+     * is passed and the given image does exist in the local image cache,
+     * but its OS or architecture does not match, the container is created
+     * with the available image, and a warning is added to the `Warnings`
+     * field in the response, for example;
+     *
+     * WARNING: The requested image's platform (linux/arm64/v8) does not
+     * match the detected host platform (linux/amd64) and no
+     * specific platform was requested
      *
      * }
      */
@@ -52,10 +68,11 @@ public function getExtraHeaders(): array
     protected function getQueryOptionsResolver(): \Symfony\Component\OptionsResolver\OptionsResolver
     {
         $optionsResolver = parent::getQueryOptionsResolver();
-        $optionsResolver->setDefined(['name']);
+        $optionsResolver->setDefined(['name', 'platform']);
         $optionsResolver->setRequired([]);
         $optionsResolver->setDefaults([]);
         $optionsResolver->addAllowedTypes('name', ['string']);
+        $optionsResolver->addAllowedTypes('platform', ['string']);
 
         return $optionsResolver;
     }
@@ -66,14 +83,14 @@ protected function getQueryOptionsResolver(): \Symfony\Component\OptionsResolver
      * @throws \Docker\API\Exception\ContainerCreateConflictException
      * @throws \Docker\API\Exception\ContainerCreateInternalServerErrorException
      *
-     * @return \Docker\API\Model\ContainersCreatePostResponse201|null
+     * @return \Docker\API\Model\ContainerCreateResponse|null
      */
     protected function transformResponseBody(\Psr\Http\Message\ResponseInterface $response, \Symfony\Component\Serializer\SerializerInterface $serializer, string $contentType = null)
     {
         $status = $response->getStatusCode();
         $body = (string) $response->getBody();
         if ((null === $contentType) === false && (201 === $status && false !== mb_strpos($contentType, 'application/json'))) {
-            return $serializer->deserialize($body, 'Docker\\API\\Model\\ContainersCreatePostResponse201', 'json');
+            return $serializer->deserialize($body, 'Docker\\API\\Model\\ContainerCreateResponse', 'json');
         }
         if ((null === $contentType) === false && (400 === $status && false !== mb_strpos($contentType, 'application/json'))) {
             throw new \Docker\API\Exception\ContainerCreateBadRequestException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);

src/Endpoint/ContainerAttach.php

@@ -17,8 +17,9 @@ class ContainerKill extends \Docker\API\Runtime\Client\BaseEndpoint implements \
      * @param string $id              ID or name of the container
      * @param array  $queryParameters {
      *
-     * @var string $signal Signal to send to the container as an integer or string (e.g. `SIGINT`)
-     *             }
+     * @var string $signal Signal to send to the container as an integer or string (e.g. `SIGINT`).
+     *
+     * }
      *
      * @param array $accept Accept content header application/json|text/plain
      */

src/Endpoint/ContainerCreate.php

@@ -89,14 +89,14 @@ protected function getQueryOptionsResolver(): \Symfony\Component\OptionsResolver
      * @throws \Docker\API\Exception\ContainerListBadRequestException
      * @throws \Docker\API\Exception\ContainerListInternalServerErrorException
      *
-     * @return \Docker\API\Model\ContainerSummaryItem[]|null
+     * @return \Docker\API\Model\ContainerSummary[]|null
      */
     protected function transformResponseBody(\Psr\Http\Message\ResponseInterface $response, \Symfony\Component\Serializer\SerializerInterface $serializer, string $contentType = null)
     {
         $status = $response->getStatusCode();
         $body = (string) $response->getBody();
         if ((null === $contentType) === false && (200 === $status && false !== mb_strpos($contentType, 'application/json'))) {
-            return $serializer->deserialize($body, 'Docker\\API\\Model\\ContainerSummaryItem[]', 'json');
+            return $serializer->deserialize($body, 'Docker\\API\\Model\\ContainerSummary[]', 'json');
         }
         if ((null === $contentType) === false && (400 === $status && false !== mb_strpos($contentType, 'application/json'))) {
             throw new \Docker\API\Exception\ContainerListBadRequestException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);

src/Endpoint/ContainerKill.php

@@ -30,7 +30,7 @@ class ContainerLogs extends \Docker\API\Runtime\Client\BaseEndpoint implements \
      *
      * }
      *
-     * @param array $accept Accept content header application/json|text/plain
+     * @param array $accept Accept content header application/vnd.docker.raw-stream|application/vnd.docker.multiplexed-stream|application/json
      */
     public function __construct(string $id, array $queryParameters = [], array $accept = [])
     {
@@ -57,7 +57,7 @@ public function getBody(\Symfony\Component\Serializer\SerializerInterface $seria
     public function getExtraHeaders(): array
     {
         if (empty($this->accept)) {
-            return ['Accept' => ['application/json', 'text/plain']];
+            return ['Accept' => ['application/vnd.docker.raw-stream', 'application/vnd.docker.multiplexed-stream', 'application/json']];
         }
 
         return $this->accept;
@@ -82,22 +82,19 @@ protected function getQueryOptionsResolver(): \Symfony\Component\OptionsResolver
 
     /**
      * @throws \Docker\API\Exception\ContainerLogsNotFoundException
-     * @throws \Docker\API\Exception\ContainerLogsInternalServerErrorException
      *
      * @return null
      */
     protected function transformResponseBody(\Psr\Http\Message\ResponseInterface $response, \Symfony\Component\Serializer\SerializerInterface $serializer, string $contentType = null)
     {
         $status = $response->getStatusCode();
         $body = (string) $response->getBody();
-        if ((null === $contentType) === false && (200 === $status && false !== mb_strpos($contentType, 'application/json'))) {
-            return json_decode($body);
+        if (200 === $status) {
         }
         if ((null === $contentType) === false && (404 === $status && false !== mb_strpos($contentType, 'application/json'))) {
-            throw new \Docker\API\Exception\ContainerLogsNotFoundException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);
+            throw new \Docker\API\Exception\ContainerLogsNotFoundException($response);
         }
-        if ((null === $contentType) === false && (500 === $status && false !== mb_strpos($contentType, 'application/json'))) {
-            throw new \Docker\API\Exception\ContainerLogsInternalServerErrorException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);
+        if (500 === $status) {
         }
     }