Merge branch 'release/1.4.1'

webdevops · Feb 14, 2017 · 94e6ea0 · 94e6ea0
2 parents a0dae85 + 2bbd28a
commit 94e6ea0
Show file tree

Hide file tree

Showing 540 changed files with 35,205 additions and 201 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 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.4.0] - 2017-02-14
+- Add webdevops/typo3-solr:3.1
+- Add webdevops/typo3-solr:4.0
+- Add webdevops/typo3-solr:5.0
+- Fix minor issues in bin/console script
+
 ## [1.4.0] - 2017-02-12
 - Add webdevops/typo3-solr:6.0
 - Improve testsuite and fixed minor issues

diff --git a/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py b/bin/webdevops/taskloader/DockerTestServerspecTaskLoader.py
@@ -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

diff --git a/conf/console.yml b/conf/console.yml
@@ -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'
diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php

diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application

diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=1.4.0
+LABEL io.webdevops.version=1.4.1
 
 ENV DOCKER_CONF_HOME /opt/docker/