Merge branch 'release/1.4.0'

Author: mblaschke

CHANGELOG.md

@@ -96,7 +96,7 @@ def task_runner(func, args, task):
         backup = sys.stdout
         sys.stdout = StringIO.StringIO()
         result = func(task=task, *args)
-        out = sys.stdout.getvalue()
+        out = sys.stdout.getvalue().strip()
         sys.stdout.close()
         sys.stdout = backup
 

bin/webdevops/taskloader/BaseTaskLoader.py

@@ -184,7 +184,6 @@ def generate_dockerfile(dockerfile, configuration, is_toolimage=False):
 
         ret.append('FROM %s' % dockerfile['image']['fullname'])
         ret.append('COPY conf/ /')
-        ret.append('RUN echo "%s" > /DOCKER.IMAGENAME' % dockerfile['image']['fullname'])
 
         if is_toolimage:
             ret.append('RUN chmod +x /loop-entrypoint.sh')

bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py

@@ -35,6 +35,10 @@ dockerTest:
   dockerfile:
     '/varnish':
       - 'ENV VARNISH_BACKEND_HOST webdevops.io'
+    '/typo3-solr':
+      - 'USER root'
+      - 'RUN apt-get update && apt-get install -y -f --no-install-recommends lsb-release lsb-base net-tools && apt-get clean -y'
+      - 'USER solr'
 
   configuration:
     default:
@@ -113,3 +117,8 @@ dockerTest:
       '/samson-deployment':
         OS_FAMILY: 'debian'
         OS_VERSION: '8'
+      '/typo3-solr':
+        OS_FAMILY: 'debian'
+        OS_VERSION: '8'
+      '/typo3-solr:6.0':
+        SOLR_VERSION: '6.3.0'

conf/console.yml

@@ -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.3.5
+LABEL io.webdevops.version=1.4.0

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.3.5
+LABEL io.webdevops.version=1.4.0

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.3.5
+LABEL io.webdevops.version=1.4.0

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.3.5
+LABEL io.webdevops.version=1.4.0

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.3.5
+LABEL io.webdevops.version=1.4.0

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.3.5
+LABEL io.webdevops.version=1.4.0