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

improve channel logic to work as expected

Browse source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2021-12-05 14:03:05 +01:00
parent d02096a1f3
commit 7902e2e75b
1 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,12 +47,7 @@ class DockerActionManager
} }
private function BuildImageName(Container $container) : string { private function BuildImageName(Container $container) : string {
$channel = $this->GetCurrentChannel(); return $container->GetContainerName() . ':' . $this->GetCurrentChannel();
if ($channel === 'develop') {
return $container->GetContainerName() . ':develop';
} else {
return $container->GetContainerName() . ':latest';
}
} }
public function GetContainerRunningState(Container $container) : IContainerState public function GetContainerRunningState(Container $container) : IContainerState
@ -79,12 +74,7 @@ class DockerActionManager
public function GetContainerUpdateState(Container $container) : IContainerState public function GetContainerUpdateState(Container $container) : IContainerState
{ {
$channel = $this->GetCurrentChannel(); $tag = $this->GetCurrentChannel();
if ($channel === 'develop') {
$tag = 'develop';
} else {
$tag = 'latest';
}
$runningDigest = $this->GetRepoDigestOfContainer($container->GetIdentifier()); $runningDigest = $this->GetRepoDigestOfContainer($container->GetIdentifier());
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag); $remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($container->GetContainerName(), $tag);
@ -350,12 +340,7 @@ class DockerActionManager
$imageName = 'nextcloud/all-in-one'; $imageName = 'nextcloud/all-in-one';
$containerName = 'nextcloud-aio-mastercontainer'; $containerName = 'nextcloud-aio-mastercontainer';
$channel = $this->GetCurrentChannel(); $tag = $this->GetCurrentChannel();
if ($channel === 'develop') {
$tag = 'develop';
} else {
$tag = 'latest';
}
$runningDigest = $this->GetRepoDigestOfContainer($containerName); $runningDigest = $this->GetRepoDigestOfContainer($containerName);
$remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($imageName, $tag); $remoteDigest = $this->dockerHubManager->GetLatestDigestOfTag($imageName, $tag);