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

Merge pull request #478 from nextcloud/enh/noid/update-handling

Browse source 
improve update handling when changing channels
This commit is contained in:
Simon L 2022-04-13 15:41:06 +02:00 • committed by GitHub
commit 541aa9c6c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,7 +100,7 @@ class DockerActionManager
$runningDigest = $this->GetRepoDigestOfContainer($container->GetIdentifier()); $runningDigest = $this->GetRepoDigestOfContainer($container->GetIdentifier());
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag); $remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag);
if ($runningDigest === $remoteDigest || $remoteDigest === null || $runningDigest === null) { if ($runningDigest === $remoteDigest || $remoteDigest === null) {
return new VersionEqualState(); return new VersionEqualState();
} else { } else {
return new VersionDifferentState(); return new VersionDifferentState();
@ -375,7 +375,6 @@ class DockerActionManager
return null; return null;
} catch (\Exception $e) { } catch (\Exception $e) {
error_log('Could not get digest of container ' . $this->BuildApiUrl($containerName) . ' ' . $e->getMessage());
return null; return null;
} }
} }
@ -413,7 +412,7 @@ class DockerActionManager
$runningDigest = $this->GetRepoDigestOfContainer($containerName); $runningDigest = $this->GetRepoDigestOfContainer($containerName);
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($imageName, $tag); $remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($imageName, $tag);
if ($remoteDigest === $runningDigest || $remoteDigest === null || $runningDigest === null) { if ($remoteDigest === $runningDigest || $remoteDigest === null) {
return false; return false;
} else { } else {
return true; return true;

2
php/src/Docker/DockerHubManager.php
View file

@ -52,8 +52,10 @@ class DockerHubManager
} }
} }
error_log('Could not get digest of container ' . $name . ':' . $tag);
return null; return null;
} catch (\Exception $e) { } catch (\Exception $e) {
error_log('Could not get digest of container ' . $name . ':' . $tag . ' ' . $e->getMessage());
return null; return null;
} }
} }