Merge branch 'release/1.1.0'

Author: mblaschke

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile).
 
+## [1.1.0] - 2016-12-14
+- Fixed dnsmasq startup
+- Removed all logfiles inside containers (using stdout)
+- Fixed syslog-ng setup (was complaining about version)
+- Fixed some php/hhvm tests
+- Improve bin/console
+- Add cleanup after container installation
+- Add multiple vhost support for dns lookup (VIRTUAL_HOST)
+
 ## [1.0.0] - 2016-11-28
 - Introduced python based processing script
 - Introduced testinfra test suite

bin/command/docker_build_command.py

@@ -28,6 +28,7 @@ class DockerBuildCommand(DoitCommand):
     Build images
 
     docker:build
+        {docker images?*         : Docker images (whitelist)}
         {--dry-run               : show only which images will be build}
         {--no-cache              : build without caching}
         {--t|threads=0           : threads}

bin/command/docker_exec_command.py

@@ -0,0 +1,93 @@
+#!/usr/bin/env/python
+# -*- coding: utf-8 -*-
+#
+# (c) 2016 WebDevOps.io
+#
+# This file is part of Dockerfile Repository.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+# to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions
+# of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+# THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+from cleo import Output
+from termcolor import colored
+from webdevops.command import DoitCommand
+from webdevops.taskloader import DockerPushTaskLoader
+from webdevops import Command, DockerfileUtility
+
+class DockerExecCommand(DoitCommand):
+    """
+    Push images to registry/hub
+
+    docker:exec
+        {docker command*         : Command}
+        {--dry-run               : show only which images will be build}
+        {--whitelist=?*          : image/tag whitelist }
+        {--blacklist=?*          : image/tag blacklist }
+    """
+
+    def run_task(self, configuration):
+        dockerfile_list = DockerfileUtility.find_dockerfiles_in_path(
+            base_path=configuration.get('dockerPath'),
+            path_regex=configuration.get('docker.pathRegex'),
+            image_prefix=configuration.get('docker.imagePrefix'),
+            whitelist=configuration.get('whitelist'),
+            blacklist=configuration.get('blacklist'),
+        )
+
+        image_fail_list = []
+
+        docker_command = self.argument('docker command')
+
+        for dockerfile in dockerfile_list:
+            title = dockerfile['image']['fullname']
+
+            print title
+            print '~' * len(title)
+
+            if configuration['dryRun']:
+                print '  exec: %s' % (docker_command)
+            else:
+
+                cmd = [
+                    'docker',
+                    'run',
+                    '-t',
+                    '--rm',
+                    dockerfile['image']['fullname'],
+                    'sh -c "%s"' % (' '.join(docker_command))
+                ]
+
+                status = Command.execute(cmd)
+
+                if status:
+                    print colored(' -> successfull', 'green')
+                else:
+                    print colored(' -> failed', 'red')
+                    image_fail_list.append(dockerfile['image']['fullname'])
+            print ''
+            print ''
+
+        if len(image_fail_list) >= 1:
+            print ''
+            print colored(' => failed images (%s):' % (str(len(image_fail_list))), 'red')
+            for image in image_fail_list:
+                print '   - %s ' % image
+            print ''
+
+            return False
+        else:
+            return True
+
+
+
+

bin/command/docker_pull_command.py

@@ -27,6 +27,7 @@ class DockerPullCommand(DoitCommand):
     Pull all built images from registry/hub
 
     docker:pull
+        {docker images?*         : Docker images (whitelist)}
         {--dry-run               : show only which images will be build}
         {--t|threads=0           : threads}
         {--r|retry=0             : retry}

bin/command/docker_push_command.py

@@ -27,6 +27,7 @@ class DockerPushCommand(DoitCommand):
     Push images to registry/hub
 
     docker:push
+        {docker images?*         : Docker images (whitelist)}
         {--dry-run               : show only which images will be build}
         {--t|threads=0           : threads}
         {--r|retry=0             : retry}

bin/command/generate_dockerfile_command.py

@@ -29,6 +29,7 @@ class GenerateDockerfileCommand(BaseCommand):
     Build Dockerfile containers
 
     generate:dockerfile
+        {docker images?*         : Docker images (whitelist)}
         {--whitelist=?*          : image/tag whitelist }
         {--blacklist=?*          : image/tag blacklist }
     """

bin/command/test_serverspec_command.py

@@ -29,6 +29,7 @@ class TestServerspecCommand(DoitCommand):
     Test docker images with Serverspec
 
     test:serverspec
+        {docker images?*         : Docker images (whitelist)}
         {--dry-run               : show only which images will be build}
         {--t|threads=0           : threads}
         {--r|retry=0             : retry}

bin/command/test_testinfra_command.py

@@ -27,6 +27,7 @@ class TestTestinfraCommand(DoitCommand):
     Test docker images with Testinfra
 
     test:testinfra
+        {docker images?*         : Docker images (whitelist)}
         {--dry-run               : show only which images will be build}
         {--t|threads=0           : threads}
         {--whitelist=?*          : image/tag whitelist }

bin/console

@@ -20,6 +20,7 @@ from webdevops.docker.DockerCliClient import DockerCliClient
 from command.docker_build_command import DockerBuildCommand
 from command.docker_push_command import DockerPushCommand
 from command.docker_pull_command import DockerPullCommand
+from command.docker_exec_command import DockerExecCommand
 from command.test_testinfra_command import TestTestinfraCommand
 from command.test_serverspec_command import TestServerspecCommand
 from command.generate_dockerfile_command import GenerateDockerfileCommand
@@ -88,6 +89,7 @@ if __name__ == '__main__':
     application.add(DockerBuildCommand(configuration=configuration))
     application.add(DockerPushCommand(configuration=configuration))
     application.add(DockerPullCommand(configuration=configuration))
+    application.add(DockerExecCommand(configuration=configuration))
     application.add(TestTestinfraCommand(configuration=configuration))
     application.add(TestServerspecCommand(configuration=configuration))
     application.add(GenerateDockerfileCommand(configuration=configuration))

bin/webdevops/DockerfileUtility.py

@@ -53,8 +53,13 @@ def find_file_in_path(dockerfile_path, filename="Dockerfile", whitelist=False, b
 
     # filter by whitelist
     if whitelist:
-        for term in whitelist:
-            file_list = filter(lambda x: term in x, file_list)
+        tmp = []
+        for file in file_list:
+            for term in whitelist:
+                if term in file:
+                    tmp.append(file)
+                    break
+        file_list = tmp
 
     if blacklist:
         for term in blacklist:
@@ -108,12 +113,11 @@ def parse_docker_info_from_path(path):
             }
             ret.append(dockerfile)
 
-    if whitelist or blacklist:
-        ret = filter_dockerfile(
-            dockerfile_list=ret,
-            whitelist=whitelist,
-            blacklist = blacklist
-        )
+    ret = filter_dockerfile(
+        dockerfile_list=ret,
+        whitelist=whitelist,
+        blacklist = blacklist
+    )
 
     return ret
 
@@ -123,8 +127,13 @@ def filter_dockerfile(dockerfile_list, whitelist=False, blacklist=False):
     Filter Dockerfiles by white- and blacklist
     """
     if whitelist:
-        for term in whitelist:
-            dockerfile_list = filter(lambda x: term in x['image']['fullname'], dockerfile_list)
+        tmp = []
+        for dockerfile in dockerfile_list:
+            for term in whitelist:
+                if term in dockerfile['image']['fullname']:
+                    tmp.append(dockerfile)
+                    break
+        dockerfile_list = tmp
 
     if blacklist:
         for term in blacklist: