mirror of
https://github.com/nextcloud/all-in-one.git
synced 2024-09-21 07:16:09 +08:00
only check if the image is actually there if no image is there
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
parent
72fe749644
commit
61caa08b10
|
@ -582,12 +582,19 @@ 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) {
|
||||||
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.");
|
$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.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue