Merge branch 'release/1.1.4'

Author: mblaschke

CHANGELOG.md

@@ -90,26 +90,26 @@ def startup(self):
         print 'Executing %s (%s)' % (self.name, ', '.join(options))
         print ''
 
-        if self.output.is_verbose():
-            try:
-                whitelist = self.get_whitelist()
-                if whitelist:
-                    print 'WHITELIST active:'
-                    for item in whitelist:
-                        print ' - %s' % item
-                    print ''
-            except:
-                pass
-
-            try:
-                blacklist = self.get_blacklist()
-                if blacklist:
-                    print 'BLACKLIST active:'
-                    for item in blacklist:
-                        print ' - %s' % item
-                    print ''
-            except:
-                pass
+        try:
+            whitelist = self.get_whitelist()
+            if whitelist:
+                print 'WHITELIST active:'
+                for item in whitelist:
+                    print ' - %s' % item
+                print ''
+        except:
+            pass
+
+        try:
+            blacklist = self.get_blacklist()
+            if blacklist:
+                print 'BLACKLIST active:'
+                for item in blacklist:
+                    print ' - %s' % item
+                print ''
+        except:
+            pass
+
     def teardown(self,exitcode):
         pass
 

bin/webdevops/command/BaseCommand.py

@@ -38,6 +38,10 @@ def generate_task_list(self, dockerfile_list):
                 'actions': [(BaseTaskLoader.task_runner, [DockerPushTaskLoader.task_run, [self.docker_client, dockerfile, self.configuration]])],
                 'task_dep': []
             }
+
+            if dockerfile['dependency']:
+                task['task_dep'].append('DockerPush|%s' % dockerfile['dependency']);
+
             tasklist.append(task)
 
         # task = {

bin/webdevops/taskloader/DockerPushTaskLoader.py

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.1.3
+LABEL io.webdevops.version=1.1.4

docker/ansible/alpine-3/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.1.3
+LABEL io.webdevops.version=1.1.4

docker/ansible/centos-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.1.3
+LABEL io.webdevops.version=1.1.4

docker/ansible/debian-7/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.1.3
+LABEL io.webdevops.version=1.1.4

docker/ansible/debian-8/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.1.3
+LABEL io.webdevops.version=1.1.4

docker/ansible/debian-9/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.1.3
+LABEL io.webdevops.version=1.1.4

docker/ansible/ubuntu-12.04/Dockerfile

@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
 MAINTAINER [email protected]
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.1.3
+LABEL io.webdevops.version=1.1.4