add withHostname, withName, withLabels support

This commit is contained in:
Sergei Shitikov
2024-12-28 13:26:52 +01:00
parent 7d5f52b6d5
commit e663bbfbcc
2 changed files with 46 additions and 12 deletions
-10
View File
@@ -31,16 +31,6 @@ class Container extends GenericContainer
return $this->withCommand($cmd); return $this->withCommand($cmd);
} }
/**
* @deprecated Use `withEntrypoint` instead
* TODO: this is just dummy method for compatibility,
* the implementation with Docker Engine API should be discussed
*/
public function withHostname(string $hostname): self
{
return $this;
}
/** /**
* @deprecated Use `withPrivilegedMode` instead * @deprecated Use `withPrivilegedMode` instead
*/ */
+46 -2
View File
@@ -29,6 +29,16 @@ class GenericContainer implements TestContainer
protected string $image; protected string $image;
protected ?string $name = null;
/**
* User-defined key/value metadata.
* @param array<string, string>|null $labels
*/
protected ?array $labels = null;
protected ?string $hostname = null;
protected string $id; protected string $id;
/** @var list<string> */ /** @var list<string> */
@@ -140,9 +150,20 @@ class GenericContainer implements TestContainer
return $this; return $this;
} }
public function withHostname(string $hostname): static
{
$this->hostname = $hostname;
return $this;
}
public function withMount(string $localPath, string $containerPath): static public function withMount(string $localPath, string $containerPath): static
{ {
$this->mounts[] = new Mount(['type' => 'bind', 'source' => $localPath, 'target' => $containerPath]); $this->mounts[] = new Mount([
'type' => 'bind',
'source' => $localPath,
'target' => $containerPath,
]);
return $this; return $this;
} }
@@ -170,6 +191,23 @@ class GenericContainer implements TestContainer
return $this; return $this;
} }
public function withName(string $name): static
{
$this->name = $name;
return $this;
}
/**
* @param array<string, string> $labels
*/
public function withLabels(array $labels): static
{
$this->labels = $labels;
return $this;
}
public function withPrivilegedMode(bool $privileged = true): static public function withPrivilegedMode(bool $privileged = true): static
{ {
$this->isPrivileged = $privileged; $this->isPrivileged = $privileged;
@@ -196,9 +234,13 @@ class GenericContainer implements TestContainer
{ {
$this->startAttempts++; $this->startAttempts++;
$containerConfig = $this->createContainerConfig(); $containerConfig = $this->createContainerConfig();
$queryParameters = [];
if ($this->name !== null) {
$queryParameters['name'] = $this->name;
}
try { try {
/** @var ContainerCreateResponse|null $containerCreateResponse */ /** @var ContainerCreateResponse|null $containerCreateResponse */
$containerCreateResponse = $this->dockerClient->containerCreate($containerConfig); $containerCreateResponse = $this->dockerClient->containerCreate($containerConfig, $queryParameters);
$this->id = $containerCreateResponse?->getId() ?? ''; $this->id = $containerCreateResponse?->getId() ?? '';
} catch (ContainerCreateNotFoundException) { } catch (ContainerCreateNotFoundException) {
if ($this->startAttempts >= self::MAX_START_ATTEMPTS) { if ($this->startAttempts >= self::MAX_START_ATTEMPTS) {
@@ -223,6 +265,8 @@ class GenericContainer implements TestContainer
$containerCreatePostBody = new ContainersCreatePostBody(); $containerCreatePostBody = new ContainersCreatePostBody();
$containerCreatePostBody->setImage($this->image); $containerCreatePostBody->setImage($this->image);
$containerCreatePostBody->setCmd($this->command); $containerCreatePostBody->setCmd($this->command);
$containerCreatePostBody->setLabels($this->labels);
$containerCreatePostBody->setHostname($this->hostname);
$envs = array_map(static fn ($key, $value) => "$key=$value", array_keys($this->env), $this->env); $envs = array_map(static fn ($key, $value) => "$key=$value", array_keys($this->env), $this->env);
$containerCreatePostBody->setEnv($envs); $containerCreatePostBody->setEnv($envs);