Merge branch 'release/1.4.1'

Author: mblaschke

CHANGELOG.md

@@ -73,6 +73,7 @@ def task_run(dockerfile, configuration, task):
 
         # create dockerfile
         tmp_suffix = '.%s_%s_%s.tmp' % (dockerfile['image']['repository'], dockerfile['image']['imageName'], dockerfile['image']['tag'])
+        tmp_suffix = tmp_suffix.replace('/', '_')
         test_dockerfile = tempfile.NamedTemporaryFile(prefix='Dockerfile.', suffix=tmp_suffix, dir=configuration.get('serverspecPath'), bufsize=0, delete=False)
 
         # serverspec conf

bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py

@@ -35,10 +35,6 @@ 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:
@@ -117,10 +113,23 @@ dockerTest:
       '/samson-deployment':
         OS_FAMILY: 'debian'
         OS_VERSION: '8'
-      '/typo3-solr':
+      '/typo3-solr:3':
+        SOLR_VERSION: '4.10.4'
+        OS_FAMILY: 'arch'
+        OS_VERSION: ''
+      '/typo3-solr:4':
+        SOLR_VERSION: '4.10.4'
+        OS_FAMILY: 'arch'
+        OS_VERSION: ''
+      '/typo3-solr:5':
+        SOLR_VERSION: '4.10.4'
+        OS_FAMILY: 'arch'
+        OS_VERSION: ''
+      '/typo3-solr:6':
+        SOLR_VERSION: '6.3.0'
         OS_FAMILY: 'debian'
         OS_VERSION: '8'
-      '/typo3-solr:6.0':
-        SOLR_VERSION: '6.3.0'
       '/typo3-solr:latest':
         SOLR_VERSION: '6.3.0'
+        OS_FAMILY: 'debian'
+        OS_VERSION: '8'

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.4.0
+LABEL io.webdevops.version=1.4.1

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.4.0
+LABEL io.webdevops.version=1.4.1

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.4.0
+LABEL io.webdevops.version=1.4.1

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.4.0
+LABEL io.webdevops.version=1.4.1

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.4.0
+LABEL io.webdevops.version=1.4.1

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.4.0
+LABEL io.webdevops.version=1.4.1

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.4.0
+LABEL io.webdevops.version=1.4.1