Merge pull request #12 from StephenBeirlaen/feature/docker-compose-v2-support

Improve detection of active containers to support docker-compose v2

Author: BlackIkeEagle

bin/composer

@@ -22,7 +22,7 @@ env = Environment(composepath + '/.env')
 
 cmd = [
     os.path.dirname(sys.argv[0]) + '/run',
-    'ps', 'application'
+    'ps', '--services', '--filter', 'status=running'
 ]
 
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -36,14 +36,15 @@ except KeyboardInterrupt:
     p.wait()
 out, err = p.communicate()
 out = out.decode('utf-8')
+runningContainers = out.splitlines()
 
 dockerrun = ['docker', 'run', '--rm']
 if sys.stdin.isatty() and sys.stdout.isatty():
     dockerrun += ['-it']
 
 cmd = dockerrun
 
-if re.search('Up', out):
+if 'application' in runningContainers:
     containercmd = [
         os.path.dirname(sys.argv[0]) + '/run',
         'ps', '-q', 'application'

bin/composer1

@@ -22,7 +22,7 @@ env = Environment(composepath + '/.env')
 
 cmd = [
     os.path.dirname(sys.argv[0]) + '/run',
-    'ps', 'application'
+    'ps', '--services', '--filter', 'status=running'
 ]
 
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -36,14 +36,15 @@ except KeyboardInterrupt:
     p.wait()
 out, err = p.communicate()
 out = out.decode('utf-8')
+runningContainers = out.splitlines()
 
 dockerrun = ['docker', 'run', '--rm']
 if sys.stdin.isatty() and sys.stdout.isatty():
     dockerrun += ['-it']
 
 cmd = dockerrun
 
-if re.search('Up', out):
+if 'application' in runningContainers:
     containercmd = [
         os.path.dirname(sys.argv[0]) + '/run',
         'ps', '-q', 'application'

bin/mysql

@@ -13,7 +13,7 @@ env = Environment(composepath + '/.env')
 
 cmd = [
     os.path.dirname(sys.argv[0]) + '/run',
-    'ps', 'mysql'
+    'ps', '--services', '--filter', 'status=running'
 ]
 
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -27,8 +27,9 @@ except KeyboardInterrupt:
     p.wait()
 out, err = p.communicate()
 out = out.decode('utf-8')
+runningContainers = out.splitlines()
 
-if not re.search('Up', out):
+if not 'mysql' in runningContainers:
     raise Exception('We need a running mysql server')
 
 cmd = [

bin/mysqldump

@@ -13,7 +13,7 @@ env = Environment(composepath + '/.env')
 
 cmd = [
     os.path.dirname(sys.argv[0]) + '/run',
-    'ps', 'mysql'
+    'ps', '--services', '--filter', 'status=running'
 ]
 
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -27,8 +27,9 @@ except KeyboardInterrupt:
     p.wait()
 out, err = p.communicate()
 out = out.decode('utf-8')
+runningContainers = out.splitlines()
 
-if not re.search('Up', out):
+if not 'mysql' in runningContainers:
     raise Exception('We need a running mysql server')
 
 cmd = [

bin/mysqlimport

@@ -16,7 +16,7 @@ if len(sys.argv) <= 1:
 
 cmd = [
     os.path.dirname(sys.argv[0]) + '/run',
-    'ps', 'mysql'
+    'ps', '--services', '--filter', 'status=running'
 ]
 
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -30,8 +30,9 @@ except KeyboardInterrupt:
     p.wait()
 out, err = p.communicate()
 out = out.decode('utf-8')
+runningContainers = out.splitlines()
 
-if not re.search('Up', out):
+if not 'mysql' in runningContainers:
     raise Exception('We need a running mysql server')
 
 cmd = [

bin/php

@@ -13,7 +13,7 @@ env = Environment(composepath + '/.env')
 
 cmd = [
     os.path.dirname(sys.argv[0]) + '/run',
-    'ps', 'application'
+    'ps', '--services', '--filter', 'status=running'
 ]
 
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -27,8 +27,9 @@ except KeyboardInterrupt:
     p.wait()
 out, err = p.communicate()
 out = out.decode('utf-8')
+runningContainers = out.splitlines()
 
-if re.search('Up', out):
+if 'application' in runningContainers:
     dockerrun = [os.path.dirname(sys.argv[0]) + '/run', 'exec']
     if not sys.stdin.isatty() or not sys.stdout.isatty():
         dockerrun += ['-T']

bin/redis-cli

@@ -13,7 +13,7 @@ env = Environment(composepath + '/.env')
 
 cmd = [
     os.path.dirname(sys.argv[0]) + '/run',
-    'ps', 'redis'
+    'ps', '--services', '--filter', 'status=running'
 ]
 
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -27,8 +27,9 @@ except KeyboardInterrupt:
     p.wait()
 out, err = p.communicate()
 out = out.decode('utf-8')
+runningContainers = out.splitlines()
 
-if not re.search('Up', out):
+if not 'redis' in runningContainers:
     raise Exception('We need a running redis server')
 
 dockerrun = [os.path.dirname(sys.argv[0]) + '/run', 'exec']