Handling failures of docker build and push commands

netsells · May 14, 2020 · db8b984 · db8b984
1 parent 7b4234e
commit db8b984
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/app/Commands/DockerBuildCommand.php b/app/Commands/DockerBuildCommand.php
@@ -71,13 +71,15 @@ public function handle()
         $this->line("Building docker images for services with tag {$tag}: " . implode(',', $services));
 
         foreach ($services as $service) {
-            $this->callBuild($tag, $service);
+            if (!$this->callBuild($tag, $service)) {
+                return 1;
+            }
         }
 
         $this->info("Docker images built.");
     }
 
-    protected function callBuild(string $tag, string $service = null): void
+    protected function callBuild(string $tag, string $service = null): bool
     {
         $process = new Process([
             'docker-compose',
@@ -89,9 +91,18 @@ protected function callBuild(string $tag, string $service = null): void
         ], null, 1200); // 20min timeout
 
         $process->start();
+        $process->wait();
 
-        foreach ($process as $data) {
-            echo $data;
+        if ($process->getExitCode() !== 0) {
+            foreach ($process as $data) {
+                echo $data;
+            }
+
+            $this->error("Unable to push all items to AWS, check the above output for reasons why.");
+            return false;
         }
+
+        echo $process->getOutput();
+        return true;
     }
 }
diff --git a/app/Commands/DockerPushCommand.php b/app/Commands/DockerPushCommand.php
@@ -83,13 +83,15 @@ public function handle()
         $this->line("Pushing docker images for services with tag {$tag}: " . implode(',', $services));
 
         foreach ($services as $service) {
-            $this->callPush($tag, $service);
+            if (!$this->callPush($tag, $service)) {
+                return 1;
+            }
         }
 
         $this->info("Docker images pushed.");
     }
 
-    protected function callPush(string $tag, string $service = null): void
+    protected function callPush(string $tag, string $service = null): bool
     {
         $process = new Process([
             'docker-compose',
@@ -101,9 +103,18 @@ protected function callPush(string $tag, string $service = null): void
         ], null, 1200); // 20min timeout
 
         $process->start();
+        $process->wait();
 
-        foreach ($process as $data) {
-            echo $data;
+        if ($process->getExitCode() !== 0) {
+            foreach ($process as $data) {
+                echo $data;
+            }
+
+            $this->error("Unable to push all items to AWS, check the above output for reasons why.");
+            return false;
         }
+
+        echo $process->getOutput();
+        return true;
     }
 }