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

Merge pull request #4066 from nextcloud/enh/4056/fix-image-check

Browse source 
only check if the image is actually there if no image is there
This commit is contained in:
Simon L 2024-01-17 09:58:16 +01:00 • committed by GitHub
commit 2c951a784b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -582,14 +582,21 @@ class DockerActionManager
$imageName = $this->BuildImageName($container); $imageName = $this->BuildImageName($container);
$encodedImageName = urlencode($imageName); $encodedImageName = urlencode($imageName);
$url = $this->BuildApiUrl(sprintf('images/create?fromImage=%s', $encodedImageName)); $url = $this->BuildApiUrl(sprintf('images/create?fromImage=%s', $encodedImageName));
$imageIsThere = true;
try { try {
$this->guzzleClient->post($url);
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $encodedImageName)); $imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $encodedImageName));
$this->guzzleClient->get($imageUrl)->getBody()->getContents(); $this->guzzleClient->get($imageUrl)->getBody()->getContents();
} catch (\Throwable $e) { } catch (\Throwable $e) {
$imageIsThere = false;
}
try {
$this->guzzleClient->post($url);
} catch (RequestException $e) {
if ($imageIsThere === false) {
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."); 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
{ {