diff --git a/php/src/Controller/DockerController.php b/php/src/Controller/DockerController.php index f040e16953a9..8c2d3abe31c6 100644 --- a/php/src/Controller/DockerController.php +++ b/php/src/Controller/DockerController.php @@ -46,7 +46,7 @@ private function PerformRecursiveContainerStart(string $id, bool $pullImage = tr if ($pullImage) { if (!$this->dockerActionManager->isDockerHubReachable($container)) { $pullImage = false; - error_log('Not pulling the image for the ' . $container->GetContainerName() . ' container because docker hub does not seem to be reachable.'); + error_log('Not pulling the ' . $container->GetContainerName() . ' image for the ' . $container->GetIdentifier() . ' container because docker hub does not seem to be reachable.'); } } diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php index e3d7c337f75b..3ec374996aca 100644 --- a/php/src/Docker/DockerActionManager.php +++ b/php/src/Docker/DockerActionManager.php @@ -167,7 +167,7 @@ public function StartContainer(Container $container) : void { try { $this->guzzleClient->post($url); } catch (RequestException $e) { - throw new \Exception("Could not start container " . $container->GetIdentifier() . ": " . $e->getMessage()); + throw new \Exception("Could not start container " . $container->GetIdentifier() . ": " . $e->getResponse()?->getBody()->getContents()); } } @@ -588,7 +588,7 @@ public function CreateContainer(Container $container) : void { ] ); } catch (RequestException $e) { - throw new \Exception("Could not create container " . $container->GetIdentifier() . ": " . $e->getMessage()); + throw new \Exception("Could not create container " . $container->GetIdentifier() . ": " . $e->getResponse()?->getBody()->getContents()); } } @@ -623,7 +623,7 @@ public function PullImage(Container $container) : void try { $this->guzzleClient->post($url); } catch (RequestException $e) { - $message = "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."; + $message = "Could not pull image " . $imageName . ": " . $e->getResponse()?->getBody()->getContents(); if ($imageIsThere === false) { throw new \Exception($message); } else { @@ -883,7 +883,7 @@ private function ConnectContainerIdToNetwork(string $id, string $internalPort, s } catch (RequestException $e) { // 409 is undocumented and gets thrown if the network already exists. if ($e->getCode() !== 409) { - throw new \Exception("Could not create the nextcloud-aio network: " . $e->getMessage()); + throw new \Exception("Could not create the nextcloud-aio network: " . $e->getResponse()?->getBody()->getContents()); } } }