Update to Version 3.5.0+180309

Update to Version 3.3.1

README.md

@@ -3,4 +3,41 @@
 
 # LimeSurvey Docker
 
-Dockerfile to build a [LimeSurvey](https://limesurvey.org) image for the Docker container platform.
+Dockerfile to build a [LimeSurvey](https://limesurvey.org) Image for the Docker container platform.
+
+# Using the apache image
+
+The apache image comes with an Apache Webserver and PHP installed.
+
+# Apache Configuration
+
+To change to Apache Webserver configuration mount a Volume into the Container at:
+
+ - /etc/apache2/sites-available/000-default.conf
+
+See the example configuration provided.
+
+# Using the fpm image
+
+To use the fpm image you need an additional web server that can proxy http-request to the fpm-port of the container.
+
+# Using an external database
+
+LimeSurvey requires an external database (MySQL, PostgreSQL) to run. See *docker-compose.yml* for example.
+
+# Persistent data
+
+To preserve the uploaded files assign the upload folder into a volume. See *docker-compose.yml* for details.
+
+# LimeSurvey Configuration
+
+To change to LimeSurvey configuration simply mount a Volume into the Container at:
+
+ - /my-data/config.php:/var/www/html/application/config/config.php
+
+**Hint**: If this configuration is present, the LimeSurvey Installer will not run.
+
+# References
+
+- https://www.limesurvey.org/
+- https://github.com/LimeSurvey/LimeSurvey/

apache-example.conf

@@ -0,0 +1,21 @@
+<VirtualHost *:80>
+	ServerAdmin foo@bar.com
+	DocumentRoot /var/www/html
+        Alias /lime "/var/www/html"
+
+        <Directory />
+                Options FollowSymLinks
+                AllowOverride None
+        </Directory>
+
+        <Directory /var/www/html>
+                Options Indexes FollowSymLinks MultiViews
+                AllowOverride All
+                Order allow,deny
+                allow from all
+        </Directory>
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
+

apache/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.2-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.2.1+180207'
+ARG version='3.5.0+180309'
 
 # Install OS dependencies
 RUN apt-get update && \

docker-compose.yml

@@ -4,6 +4,8 @@ services:
     build:
       context: .
       dockerfile: apache/Dockerfile
+    volumes:
+      - /tmp/upload/:/var/www/html/upload/
     links:
       - lime-db
     depends_on:

fpm/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.2-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.2.1+180207'
+ARG version='3.5.0+180309'
 
 # Install OS dependencies
 RUN apt-get update && \