eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 14:36:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #497 from nextcloud/fix/489/channel-switch

Browse source 
refactor detection of available container updates
This commit is contained in:
Simon L 2022-04-20 17:26:26 +02:00 • committed by GitHub
commit a2047dc04b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

66
php/src/Docker/DockerActionManager.php
View file

@ -97,14 +97,21 @@ class DockerActionManager
{ {
$tag = $this->GetCurrentChannel(); $tag = $this->GetCurrentChannel();
$runningDigest = $this->GetRepoDigestOfContainer($container->GetIdentifier()); $runningDigests = $this->GetRepoDigestsOfContainer($container->GetIdentifier());
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag); if ($runningDigests === null) {
if ($runningDigest === $remoteDigest || $remoteDigest === null || $runningDigest === null) {
return new VersionEqualState();
} else {
return new VersionDifferentState(); return new VersionDifferentState();
} }
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag);
if ($remoteDigest === null) {
return new VersionEqualstate();
}
foreach($runningDigests as $runningDigest) {
if ($runningDigest === $remoteDigest) {
return new VersionEqualState();
}
}
return new VersionDifferentState();
} }
public function GetContainerStartingState(Container $container) : IContainerState public function GetContainerStartingState(Container $container) : IContainerState
@ -358,7 +365,7 @@ class DockerActionManager
} }
} }
private function GetRepoDigestOfContainer(string $containerName) : ?string { private function GetRepoDigestsOfContainer(string $containerName) : ?array {
try { try {
$containerUrl = $this->BuildApiUrl(sprintf('containers/%s/json', $containerName)); $containerUrl = $this->BuildApiUrl(sprintf('containers/%s/json', $containerName));
$containerOutput = json_decode($this->guzzleClient->get($containerUrl)->getBody()->getContents(), true); $containerOutput = json_decode($this->guzzleClient->get($containerUrl)->getBody()->getContents(), true);
@ -367,10 +374,30 @@ class DockerActionManager
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $imageName)); $imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $imageName));
$imageOutput = json_decode($this->guzzleClient->get($imageUrl)->getBody()->getContents(), true); $imageOutput = json_decode($this->guzzleClient->get($imageUrl)->getBody()->getContents(), true);
if(isset($imageOutput['RepoDigests']) && count($imageOutput['RepoDigests']) === 1) { if (!isset($imageOutput['RepoDigests'])) {
$fullDigest = $imageOutput['RepoDigests'][0]; error_log('RepoDigests is not set of container ' . $containerName);
return null;
}
return substr($fullDigest, strpos($fullDigest, "@") + 1); if (!is_array($imageOutput['RepoDigests'])) {
error_log('RepoDigests of ' . $containerName . ' is not an array which is not allowed!');
return null;
}
$repoDigestArray = [];
$oneDigestGiven = false;
foreach($imageOutput['RepoDigests'] as $repoDigest) {
$digestPosition = strpos($repoDigest, '@');
if ($digestPosition === false) {
error_log('Somehow the RepoDigest of ' . $containerName . ' does not contain a @.');
return null;
}
$repoDigestArray[] = substr($repoDigest, $digestPosition + 1);
$oneDigestGiven = true;
}
if ($oneDigestGiven) {
return $repoDigestArray;
} }
return null; return null;
@ -409,14 +436,21 @@ class DockerActionManager
$tag = $this->GetCurrentChannel(); $tag = $this->GetCurrentChannel();
$runningDigest = $this->GetRepoDigestOfContainer($containerName); $runningDigests = $this->GetRepoDigestsOfContainer($containerName);
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($imageName, $tag); if ($runningDigests === null) {
if ($remoteDigest === $runningDigest || $remoteDigest === null || $runningDigest === null) {
return false;
} else {
return true; return true;
} }
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($imageName, $tag);
if ($remoteDigest === null) {
return false;
}
foreach ($runningDigests as $runningDigest) {
if ($remoteDigest === $runningDigest) {
return false;
}
}
return true;
} }
public function sendNotification(Container $container, string $subject, string $message) : void public function sendNotification(Container $container, string $subject, string $message) : void