nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-10-07 22:17:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3774 from nextcloud/enh/3769/make-pull-image-failure-proof

Browse source
This commit is contained in:
Simon L 2023-11-23 10:10:55 +01:00 • committed by GitHub
commit 8b39a5ec73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,9 +579,15 @@ class DockerActionManager
public function PullImage(Container $container) : void public function PullImage(Container $container) : void
{ {
$url = $this->BuildApiUrl(sprintf('images/create?fromImage=%s', urlencode($this->BuildImageName($container)))); $imageName = urlencode($this->BuildImageName($container));
// do not catch any exception so that it always throws and logs the error $url = $this->BuildApiUrl(sprintf('images/create?fromImage=%s', $imageName));
$this->guzzleClient->post($url); try {
$this->guzzleClient->post($url);
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $imageName));
$this->guzzleClient->get($imageUrl)->getBody()->getContents();
} catch (\Throwable $e) {
throw new \Exception("Could not pull image " . $imageName . ". Please run 'sudo docker exec -it nextcloud-aio-mastercontainer docker pull " . $imageName . "' in order to find out why it failed.");
}
} }
private function isContainerUpdateAvailable(string $id) : string private function isContainerUpdateAvailable(string $id) : string