daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-06-03 01:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 1c85e3e825 d2cadf6b9f
commit 541aa9c6c0
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());
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag);
if ($runningDigest === $remoteDigest || $remoteDigest === null || $runningDigest === null) {
if ($runningDigest === $remoteDigest || $remoteDigest === null) {
return new VersionEqualState();
} else {
return new VersionDifferentState();
@@ -375,7 +375,6 @@ class DockerActionManager
return null;
} catch (\Exception $e) {
error_log('Could not get digest of container ' . $this->BuildApiUrl($containerName) . ' ' . $e->getMessage());
return null;
}
}
@@ -413,7 +412,7 @@ class DockerActionManager
$runningDigest = $this->GetRepoDigestOfContainer($containerName);
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($imageName, $tag);
if ($remoteDigest === $runningDigest || $remoteDigest === null || $runningDigest === null) {
if ($remoteDigest === $runningDigest || $remoteDigest === null) {
return false;
} else {
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;
} catch (\Exception $e) {
error_log('Could not get digest of container ' . $name . ':' . $tag . ' ' . $e->getMessage());
return null;
}
}