From f7e97d4932628811df34e97e2b94b64ddc8195d3 Mon Sep 17 00:00:00 2001 From: Sergei Shitikov Date: Fri, 6 Sep 2024 22:19:52 +0200 Subject: [PATCH] cleanup --- src/Container/GenericContainer.php | 2 ++ src/Container/StartedGenericContainer.php | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Container/GenericContainer.php b/src/Container/GenericContainer.php index ed5a39a..9a0a266 100644 --- a/src/Container/GenericContainer.php +++ b/src/Container/GenericContainer.php @@ -11,6 +11,7 @@ use Docker\API\Model\HostConfig; use Docker\API\Model\Mount; use Docker\API\Model\PortBinding; use Docker\Docker; +use Docker\Stream\CreateImageStream; use InvalidArgumentException; use Testcontainers\ContainerClient\DockerContainerClient; use Testcontainers\Utils\PortGenerator\RandomUniquePortGenerator; @@ -230,6 +231,7 @@ class GenericContainer implements TestContainer $containerCreateResponse = $this->dockerClient->containerCreate($containerCreatePostBody); $this->id = $containerCreateResponse?->getId() ?? ''; } catch (ContainerCreateNotFoundException) { + /** @var CreateImageStream $imageCreateResponse */ $this->dockerClient->imageCreate(null, [ 'fromImage' => explode(':', $this->image)[0], 'tag' => explode(':', $this->image)[1] ?? 'latest', diff --git a/src/Container/StartedGenericContainer.php b/src/Container/StartedGenericContainer.php index ee509f4..60d478c 100644 --- a/src/Container/StartedGenericContainer.php +++ b/src/Container/StartedGenericContainer.php @@ -6,6 +6,7 @@ namespace Testcontainers\Container; use Docker\API\Client; use Docker\API\Model\ContainersIdExecPostBody; +use Docker\API\Model\ContainersIdJsonGetResponse200; use Docker\API\Model\IdResponse; use Docker\API\Runtime\Client\Client as DockerRuntimeClient; use Docker\Docker; @@ -110,16 +111,13 @@ class StartedGenericContainer implements StartedTestContainer //TODO: not ready yet public function getFirstMappedPort(): int { - var_dump($this->dockerClient);die(123); - /** @var \Docker\API\Model\ContainersIdJsonGetResponse200 | null $containerInspectResponse */ + /** @var ContainersIdJsonGetResponse200 | null $containerInspectResponse */ $containerInspectResponse = $this->dockerClient->containerInspect($this->id); $settings = $containerInspectResponse->getNetworkSettings(); $ports = (array)$settings->getPorts(); $port = array_key_first($ports); - var_dump($ports, $port, (int)$ports[$port][0]->getHostPort()); - return (int) $ports[$port][0]->getHostPort(); }