Benzine/Docker-Runit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Allow ignoring changes that don't affect us, for envs not tagged with BOUNCER_DOMAIN

Browse source
This commit is contained in:
Greyscale 2024-01-08 18:57:05 +01:00
parent 2ad06e42d2
commit b78833a98a
No known key found for this signature in database
GPG key ID: 74BAFF55434DA4B2
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bouncer/bouncer
View file

@ -670,6 +670,24 @@ class Bouncer
return json_decode($this->client->request('GET', "containers/{$id}/json")->getBody()->getContents(), true);
}
private function dockerEnvHas(string $key, ?array $envs): bool
{
if ($envs === null) {
return false;
}
foreach ($envs as $env) {
if (stripos($env, '=') !== false) {
[$envKey, $envVal] = explode('=', $env, 2);
if ($envKey === $key) {
return true;
}
}
}
return false;
}
private function dockerEnvFilter(?array $envs): array
{
if ($envs === null) {
@ -722,12 +740,17 @@ class Bouncer
foreach ($containers as $container) {
$inspect = $this->dockerGetContainer($container['Id']);
$name = ltrim($inspect['Name'], '/');
$env = $inspect['Config']['Env'] ?? [];
if (!$this->dockerEnvHas('BOUNCER_DOMAIN', $env)) {
continue;
}
$newContainerState[$name] = [
'name' => $name,
'created' => $inspect['Created'],
'image' => $inspect['Image'],
'status' => $inspect['State']['Status'],
'env' => $this->dockerEnvFilter($inspect['Config']['Env']),
'env' => $this->dockerEnvFilter($env),
];
if (is_array($newContainerState[$name]['env'])) {
sort($newContainerState[$name]['env']);
@ -752,8 +775,11 @@ class Bouncer
$this->logger->warning(sprintf('Something happened while interrogating services.. This node is not a swarm node, cannot have services: %s', $services['message']));
} else {
foreach ($services as $service) {
$env = $service['Spec']['TaskTemplate']['ContainerSpec']['Env'] ?? [];
$name = $service['Spec']['Name'];
$env = $service['Spec']['TaskTemplate']['ContainerSpec']['Env'] ?? [];
if (!$this->dockerEnvHas('BOUNCER_DOMAIN', $env)) {
continue;
}
$newSwarmState[$name] = [
'id' => $service['ID'],
'mode' => isset($service['Spec']['Mode']['Replicated']) ?