Update to Version 3.6.3+180416

Update to Version 3.3.1

.gitignore

@@ -0,0 +1,4 @@
+\#*
+.\#*
+
+.venv/

README.md

@@ -3,8 +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.
 
-# Persistence
+# 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.3.0+180209'
+ARG version='3.6.3+180416'
 
 # Install OS dependencies
 RUN apt-get update && \

fpm/Dockerfile

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

upgrade.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+
+import feedparser
+import sys
+import subprocess
+
+dockerfile_apache = 'apache/Dockerfile'
+dockerfile_fpm = 'fpm/Dockerfile'
+
+limesv_feed_url = 'https://github.com/LimeSurvey/LimeSurvey/releases.atom'
+docker_feed_url = 'https://github.com/martialblog/docker-limesurvey/releases.atom'
+
+limesv_feed = feedparser.parse(limesv_feed_url)
+docker_feed = feedparser.parse(docker_feed_url)
+
+limesv_current_release = limesv_feed.entries[0].title_detail.value
+docker_current_release = docker_feed.entries[0].title_detail.value
+
+if limesv_current_release == docker_current_release:
+    print('Nothing to do.')
+    sys.exit(0)
+
+print('New Version {} available. Upgrading...'.format(limesv_current_release))
+commit_message = 'Update to Version {}'.format(limesv_current_release)
+
+# Dockerfiles
+regexp = 's/[0-9]\.[0-9]\.[0-9]+[0-9]*/{new_version}/'.format(new_version=limesv_current_release)
+subprocess.call(['sed', '-i', '-e',  regexp, dockerfile_apache])
+subprocess.call(['sed', '-i', '-e',  regexp, dockerfile_fpm])
+print('> Updated Dockerfiles')
+
+# Git Commit/Tag
+# subprocess.call(['git', 'checkout', '-b', limesv_current_release])
+subprocess.call(['git', 'add',  dockerfile_apache])
+subprocess.call(['git', 'add',  dockerfile_fpm])
+subprocess.call(['git', 'commit',  '-m', commit_message])
+subprocess.call(['git', 'tag', limesv_current_release])
+print('> Created new Commit and Tag')
+
+# Git Push
+# subprocess.call(['git', 'push', 'origin', limesv_current_release])
+subprocess.call(['git', 'push'])
+subprocess.call(['git', 'push', 'origin', '--tags'])
+print('> Pushed to new Branch')
+
+sys.exit(0)