From 91cd25bc51974d4ebfdfec28f6a6bbe54053de24 Mon Sep 17 00:00:00 2001
From: Philipp Kitzberger <philipp@kitze.net>
Date: Thu, 5 Mar 2020 12:44:07 +0100
Subject: [PATCH 1/3] FIX: present docker-compose.yml prevents share:restore
 when 'docker' missing

---
 .../Console/Command/Sync/AbstractCommand.php  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/app/CliTools/Console/Command/Sync/AbstractCommand.php b/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
index de416c5..bd51954 100644
--- a/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
+++ b/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
@@ -608,18 +608,25 @@ protected function checkIfDockerExists()
         $dockerPath = \CliTools\Utility\DockerUtility::searchDockerDirectoryRecursive();
 
         if (!empty($dockerPath)) {
-            $this->output->writeln('<info>Running docker containers:</info>');
+            $this->output->writeln('<info>Found docker-compose.yml</info>');
 
-            // Docker instance found
-            $docker = new CommandBuilder('docker', 'ps');
-            $docker->executeInteractive();
+            try {
+                $this->output->writeln('<info>Trying to detect running docker containers ...</info>');
 
-            $answer = ConsoleUtility::questionYesNo('Are these running containers the right ones?', 'no');
+                $docker = new CommandBuilder('docker', 'ps');
+                $docker->executeInteractive();
 
-            if (!$answer) {
-                throw new \CliTools\Exception\StopException(1);
+                $answer = ConsoleUtility::questionYesNo('Are these running containers the right ones?', 'no');
+            } catch (\CliTools\Exception\CommandExecutionException $e) {
+                $this->output->writeln('<warning>' . $e->getMessage() . '</warning>');
+
+                $answer = ConsoleUtility::questionYesNo('Continue anyway?', 'no');
             }
         }
+
+        if (!$answer) {
+            throw new \CliTools\Exception\StopException(1);
+        }
     }
 
     /**

From 4c28e4a267ce85d5883e2199c2b46ee764f17c54 Mon Sep 17 00:00:00 2001
From: Philipp Kitzberger <philipp@kitze.net>
Date: Mon, 9 Mar 2020 22:01:28 +0100
Subject: [PATCH 2/3] FIX: exception when no docker-compose.yml available

---
 src/app/CliTools/Console/Command/Sync/AbstractCommand.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/CliTools/Console/Command/Sync/AbstractCommand.php b/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
index bd51954..e061d7b 100644
--- a/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
+++ b/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
@@ -624,7 +624,8 @@ protected function checkIfDockerExists()
             }
         }
 
-        if (!$answer) {
+        if (empty($answer)) {
+            $this->output->writeln('<error>Aborting</error>');
             throw new \CliTools\Exception\StopException(1);
         }
     }

From 949ea0ee08deee4752409ed53a700dfaeb56558c Mon Sep 17 00:00:00 2001
From: Philipp Kitzberger <philipp@kitze.net>
Date: Mon, 16 Mar 2020 12:13:56 +0100
Subject: [PATCH 3/3] FIX: exception when docker-compose.yml available

---
 src/app/CliTools/Console/Command/Sync/AbstractCommand.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/CliTools/Console/Command/Sync/AbstractCommand.php b/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
index e061d7b..6cbf250 100644
--- a/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
+++ b/src/app/CliTools/Console/Command/Sync/AbstractCommand.php
@@ -622,11 +622,11 @@ protected function checkIfDockerExists()
 
                 $answer = ConsoleUtility::questionYesNo('Continue anyway?', 'no');
             }
-        }
 
-        if (empty($answer)) {
-            $this->output->writeln('<error>Aborting</error>');
-            throw new \CliTools\Exception\StopException(1);
+            if (empty($answer)) {
+                $this->output->writeln('<error>Aborting</error>');
+                throw new \CliTools\Exception\StopException(1);
+            }
         }
     }