Release version 1.7.0

baselayout/usr/local/bin/apk-install

@@ -4,8 +4,6 @@ set -o pipefail  # trace ERR through pipes
 set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
 set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
 
-apk update
-
 # Install packages
 apk add --no-cache --upgrade $*
 

baselayout/usr/local/bin/apk-install-edge

@@ -7,8 +7,6 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 cp -a /etc/apk/repositories /etc/apk/.repositories.original
 sed -i -e 's/v[\.0-9]*/edge/g' /etc/apk/repositories
 
-apk update
-
 # Install packages
 apk add --no-cache --upgrade $*
 

baselayout/usr/local/bin/apk-upgrade

@@ -4,9 +4,6 @@ set -o pipefail  # trace ERR through pipes
 set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
 set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
 
-# Update apk cache
-apk update
-
 # Install packages
 apk upgrade --no-cache --force
 

bin/webdevops/doit/DoitReporter.py

@@ -105,6 +105,13 @@ class DoitReporter(object):
     task_finished = 0
     task_total = 0
 
+    COLOR_SCHEMA = {
+        'skipped':   'yellow',
+        'simulated': 'blue',
+        'success':   'green',
+        'failed':    'red',
+    }
+
     def __init__(self, outstream, options=None): #pylint: disable=W0613
         # result is sent to stdout when doit finishes running
         self.t_results = {}
@@ -147,7 +154,7 @@ def add_failure(self, task, exception):
         if task.actions and (task.name[0] != '_'):
             duration = self.duration(self.t_results[task.name].elapsed)
             progress = self.calc_progress()
-            self.writeln(colored('.  %s FAILED (%s, #%s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'red'))
+            self.writeln(colored('.  %s FAILED (%s, #%s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), DoitReporter.COLOR_SCHEMA['failed']))
         self.failures.append({'task': task, 'exception': exception})
 
     def add_success(self, task):
@@ -164,18 +171,27 @@ def add_success(self, task):
             progress = self.calc_progress()
 
             if DoitReporter.simulation_mode:
-                self.writeln(
-                    colored('.  %s simulated (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'blue')
-                )
+                output_status = 'simulated'
+                output_color = DoitReporter.COLOR_SCHEMA['simulated']
             else:
                 if DoitReporter.skip_detection and durationSeconds < 1:
-                    self.writeln(
-                        colored('.  %s SKIPPED (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'yellow')
-                    )
+                    output_status = 'SKIPPED'
+                    output_color = DoitReporter.COLOR_SCHEMA['skipped']
                 else:
-                    self.writeln(
-                        colored('.  %s finished (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), duration, progress), 'green')
-                    )
+                    output_status = 'finished'
+                    output_color = DoitReporter.COLOR_SCHEMA['success']
+
+            # custom status
+            task_status = BaseTaskLoader.get_task_status(task.name)
+            if task_status:
+                if task_status['color'] and task_status['color'] in DoitReporter.COLOR_SCHEMA:
+                    output_color = DoitReporter.COLOR_SCHEMA[task_status['color']]
+                if task_status['status']:
+                    output_status = task_status['status']
+
+            self.writeln(
+                colored('.  %s %s (%s, %s)' % (BaseTaskLoader.human_task_name(task.title()), output_status, duration, progress), output_color)
+            )
 
     def skip_uptodate(self, task):
         """

bin/webdevops/taskloader/BaseTaskLoader.py

@@ -28,6 +28,7 @@ class BaseTaskLoader(TaskLoader):
     configuration = False
     reporter = False
     TASK_COUNT = 0
+    TASK_RESULTS = {}
 
     def __init__(self, configuration):
         """
@@ -50,6 +51,24 @@ def process_tasklist(self, tasklist):
 
         return ret
 
+    @staticmethod
+    def set_task_status(task, status, color):
+        """
+        Set task status
+        """
+
+        BaseTaskLoader.TASK_RESULTS[task.name] = {
+            'task': task,
+            'status': status,
+            'color': color
+        }
+
+    @staticmethod
+    def get_task_status(task):
+        ret = False
+        if task in BaseTaskLoader.TASK_RESULTS:
+            ret = BaseTaskLoader.TASK_RESULTS[task]
+        return ret
 
     @staticmethod
     def human_task_name(name):

bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py

@@ -67,6 +67,7 @@ def task_run(dockerfile, configuration, task):
         if dockerfile['image']['duplicate']:
             print '  Docker image %s is build from symlink and duplicate of %s' % (dockerfile['image']['fullname'], dockerfile['image']['from'])
             print '  -> skipping tests'
+            BaseTaskLoader.set_task_status(task, 'skipped (symlink)', 'skipped')
             return True
 
         # Check if current image is a toolimage (no daemon)
@@ -124,6 +125,7 @@ def task_run(dockerfile, configuration, task):
         # check if we have any tests
         if not os.path.isfile(spec_abs_path):
             print '         no tests defined (%s)' % (spec_path)
+            BaseTaskLoader.set_task_status(task, 'skipped (no test)', 'skipped')
             return True
 
         # build rspec/serverspec command

conf/provision.yml

@@ -61,17 +61,11 @@ provision:
       development/general: '*'
   php-apache-dev:
     configuration:
-      apache/general    : '*'
-      apache/centos     : centos-*
-      apache/alpine     : alpine
       php-apache/general: '*'
       php-dev/general   : '*'
       apache-dev/general: '*'
   php-nginx-dev:
     configuration:
-      nginx/general     : '*'
-      nginx/centos      : centos-*
-      nginx/alpine      : alpine
       php-nginx/general : '*'
       php-dev/general   : '*'
       nginx-dev/general : '*'

docker/apache-dev/alpine/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443

docker/apache-dev/centos-7/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443

docker/apache-dev/debian-7/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443

docker/apache-dev/debian-8/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443

docker/apache-dev/debian-9/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443

docker/apache-dev/ubuntu-12.04/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443

docker/apache-dev/ubuntu-14.04/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443

docker/apache-dev/ubuntu-15.04/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443

docker/apache-dev/ubuntu-15.10/Dockerfile

@@ -11,10 +11,6 @@ ENV WEB_DOCUMENT_ROOT=/app \
 
 COPY conf/ /opt/docker/
 
-# Install apache
-RUN echo \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
-    && /opt/docker/bin/bootstrap.sh \
-    && docker-image-cleanup
+
 
 EXPOSE 80 443