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 #1069 from nextcloud/fix/1067/fix-pulling-images

Browse source 
do not pull containers if START_CONTAINERS was provided and not …
This commit is contained in:
Simon L 2022-09-08 15:45:54 +02:00 • committed by GitHub
commit 8c544d96c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
php/src/Controller/DockerController.php
View file

@ -30,20 +30,19 @@ class DockerController
$container = $this->containerDefinitionFetcher->GetContainerById($id); $container = $this->containerDefinitionFetcher->GetContainerById($id);
foreach($container->GetDependsOn() as $dependency) { foreach($container->GetDependsOn() as $dependency) {
$this->PerformRecursiveContainerStart($dependency); $this->PerformRecursiveContainerStart($dependency, $pullContainer);
} }
if ($id === 'nextcloud-aio-database') { if ($id === 'nextcloud-aio-database') {
if ($this->dockerActionManager->GetDatabasecontainerExitCode() > 0) { if ($this->dockerActionManager->GetDatabasecontainerExitCode() > 0) {
$pullContainer = false; $pullContainer = false;
error_log('Not pulling the latest database image because the container was not correctly shut down.');
} }
} }
$this->dockerActionManager->DeleteContainer($container); $this->dockerActionManager->DeleteContainer($container);
$this->dockerActionManager->CreateVolumes($container); $this->dockerActionManager->CreateVolumes($container);
if ($pullContainer) { if ($pullContainer) {
$this->dockerActionManager->PullContainer($container); $this->dockerActionManager->PullContainer($container);
} else {
error_log('Not pulling the latest database image because the container was not correctly shut down.');
} }
$this->dockerActionManager->CreateContainer($container); $this->dockerActionManager->CreateContainer($container);
$this->dockerActionManager->StartContainer($container); $this->dockerActionManager->StartContainer($container);