Upgrade to LimeSurvey 5.0 (#62)

* Add Dockerfiles for LimeSurvey 5.0

 - This changes the default user to www-data in the Apache2 Images
 - Removed extra download layer
 - Add LS 5.0 Update Guide
 - Update base images to PHP 8.0
 - Add Variable for showScriptName

.gitattributes

@@ -0,0 +1,2 @@
+# force LF in entrypoint.sh
+entrypoint.sh text eol=lf

.travis.yml

@@ -2,12 +2,17 @@ sudo: required
 language: bash
 services:
   - docker
-
-matrix:
+install:
+jobs:
   include:
+    - env: HADOLINT="${HOME}/hadolint"
+      script:
+          - curl -sL -o ${HADOLINT} "https://github.com/hadolint/hadolint/releases/download/v1.23.0/hadolint-$(uname -s)-$(uname -m)"
+          - chmod 700 ${HADOLINT}
+          - git ls-files --exclude='Dockerfile*' --ignored | xargs --max-lines=1 ${HADOLINT} --ignore DL4006 --ignore DL3008 --ignore DL3018
     - env: TAG=martialblog/limesurvey-apache
-      script: cd 3.0/apache; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 5.0/apache; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
     - env: TAG=martialblog/limesurvey-fpm
-      script: cd 3.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 5.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
     - env: TAG=martialblog/limesurvey-alpine
-      script: cd 3.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 5.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG

3.0/apache/Dockerfile

@@ -1,7 +1,9 @@
-FROM php:7.2-apache
+FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.23.1+200825'
-ARG sha256_checksum='97bb74f2e8b544af7cec85b5673b75863118834531d0fa3d42a9ac423e4aa0fd'
+ARG version='3.26.5+210519'
+ARG sha256_checksum='fbe6c59b6b23f34f1d9dbc8ca64dfb4ce8573cc0925e9aad2db00c6b0d4b62fd'
+ARG USER=root
+ARG LISTEN_PORT=80
 
 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +14,15 @@ RUN set -ex; \
         libldap2-dev \
         libfreetype6-dev \
         libjpeg-dev \
+        libonig-dev \
         zlib1g-dev \
         libc-client-dev \
         libkrb5-dev \
         libpng-dev \
         libpq-dev \
+        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
         netcat \
         \
         && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +34,7 @@ RUN set -ex; \
 
 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         exif \
@@ -40,6 +46,8 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
+        sodium \
+        tidy \
         zip
 
 ENV LIMESURVEY_VERSION=$version
@@ -58,16 +66,16 @@ RUN a2enmod headers rewrite remoteip; \
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
 # Download, unzip and chmod LimeSurvey from official GitHub repository
-RUN curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz
-
 RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
         rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R www-data:www-data /var/www/html
+        chown -R www-data:www-data /var/www/html /etc/apache2
 
+WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
-
+USER $USER
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]

3.0/apache/entrypoint.sh

@@ -11,21 +11,20 @@ DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
-
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 
+BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
 
 DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
 
+LISTEN_PORT=${LISTEN_PORT:-"80"}
+
 if [ -z "$DB_PASSWORD" ]; then
     echo >&2 'Error: Missing DB_PASSWORD'
     exit 1
@@ -36,6 +35,11 @@ if [ -z "$ADMIN_PASSWORD" ]; then
     exit 1
 fi
 
+if [ "$LISTEN_PORT" != "80" ]; then
+    echo "Info: Customizing Apache Listen port to $LISTEN_PORT"
+    sed -i "s/80/$LISTEN_PORT/" /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf
+fi
+
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
     until nc -z -v -w30 $DB_HOST $DB_PORT
@@ -90,6 +94,9 @@ return array(
       'rules' => array(),
       'showScriptName' => true,
     ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
   ),
   'config'=>array(
     'publicurl'=>'$PUBLIC_URL',
@@ -102,27 +109,6 @@ EOF
 
 fi
 
-# Check if security config already provisioned
-if [ -f application/config/security.php ]; then
-    echo 'Info: security.php already provisioned'
-else
-    echo 'Info: Creating security.php'
-    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
-
-        cat <<EOF > application/config/security.php
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-\$config = array();
-\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
-\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
-\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-return \$config;
-EOF
-    else
-        echo >&2 'Warning: No encryption keys were provided'
-        echo >&2 'Warning: A security.php config will be created by the application'
-        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
-    fi
-fi
 
 # Check if LimeSurvey database is provisioned
 echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'

3.0/fpm-alpine/Dockerfile

@@ -1,22 +1,26 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.23.1+200825'
-ARG sha256_checksum='97bb74f2e8b544af7cec85b5673b75863118834531d0fa3d42a9ac423e4aa0fd'
+ARG version='3.26.5+210519'
+ARG sha256_checksum='fbe6c59b6b23f34f1d9dbc8ca64dfb4ce8573cc0925e9aad2db00c6b0d4b62fd'
 
 # Install OS dependencies
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
         freetype-dev \
         libpng-dev \
+        libzip-dev \
         libjpeg-turbo-dev \
+        tidyhtml-dev \
+        libsodium-dev \
         openldap-dev \
+        oniguruma-dev \
         imap-dev \
         postgresql-dev && \
         apk add --no-cache netcat-openbsd bash
 
 # Install PHP Plugins
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr ; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
         docker-php-ext-configure imap --with-imap-ssl && \
         docker-php-ext-install \
         gd \
@@ -27,12 +31,13 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
+        sodium \
+        tidy \
         zip
 
-# Download, unzip and chmod of LimeSurvey
-RUN curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz
-
+# Download, unzip and chmod LimeSurvey from official GitHub repository
 RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
@@ -46,6 +51,7 @@ RUN set -ex; \
 
 EXPOSE 9000
 
+WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]

3.0/fpm-alpine/entrypoint.sh

@@ -11,15 +11,12 @@ DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
-
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 
+BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
 
@@ -90,6 +87,9 @@ return array(
       'rules' => array(),
       'showScriptName' => true,
     ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
   ),
   'config'=>array(
     'publicurl'=>'$PUBLIC_URL',
@@ -102,27 +102,6 @@ EOF
 
 fi
 
-# Check if security config already provisioned
-if [ -f application/config/security.php ]; then
-    echo 'Info: security.php already provisioned'
-else
-    echo 'Info: Creating security.php'
-    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
-
-        cat <<EOF > application/config/security.php
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-\$config = array();
-\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
-\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
-\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-return \$config;
-EOF
-    else
-        echo >&2 'Warning: No encryption keys were provided'
-        echo >&2 'Warning: A security.php config will be created by the application'
-        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
-    fi
-fi
 
 # Check if LimeSurvey database is provisioned
 echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'

3.0/fpm/Dockerfile

@@ -1,7 +1,7 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.23.1+200825'
-ARG sha256_checksum='97bb74f2e8b544af7cec85b5673b75863118834531d0fa3d42a9ac423e4aa0fd'
+ARG version='3.26.5+210519'
+ARG sha256_checksum='fbe6c59b6b23f34f1d9dbc8ca64dfb4ce8573cc0925e9aad2db00c6b0d4b62fd'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,15 @@ RUN set -ex; \
         libldap2-dev \
         libfreetype6-dev \
         libjpeg-dev \
+        libonig-dev \
         zlib1g-dev \
         libc-client-dev \
         libkrb5-dev \
         libpng-dev \
         libpq-dev \
+        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
         netcat \
         \
         && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +32,7 @@ RUN set -ex; \
 
 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         exif \
@@ -40,14 +44,15 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
+        sodium \
+        tidy \
         zip
 
 ENV LIMESURVEY_VERSION=$version
 
 # Download, unzip and chmod LimeSurvey from official GitHub repository
-RUN curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz
-
 RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
@@ -56,6 +61,7 @@ RUN set -ex; \
 
 EXPOSE 9000
 
+WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]

3.0/fpm/entrypoint.sh

@@ -11,15 +11,12 @@ DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
-
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 
+BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
 
@@ -90,6 +87,9 @@ return array(
       'rules' => array(),
       'showScriptName' => true,
     ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
   ),
   'config'=>array(
     'publicurl'=>'$PUBLIC_URL',
@@ -102,27 +102,6 @@ EOF
 
 fi
 
-# Check if security config already provisioned
-if [ -f application/config/security.php ]; then
-    echo 'Info: security.php already provisioned'
-else
-    echo 'Info: Creating security.php'
-    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
-
-        cat <<EOF > application/config/security.php
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-\$config = array();
-\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
-\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
-\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-return \$config;
-EOF
-    else
-        echo >&2 'Warning: No encryption keys were provided'
-        echo >&2 'Warning: A security.php config will be created by the application'
-        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
-    fi
-fi
 
 # Check if LimeSurvey database is provisioned
 echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'

4.0/apache/Dockerfile

@@ -1,7 +1,9 @@
-FROM php:7.2-apache
+FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.14+200826'
-ARG sha256_checksum='255f091c47b981ce4905670b49c05cbeeba306253c7454bb49054377ee7bc00a'
+ARG version='4.6.3+210518'
+ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'
+ARG USER=root
+ARG LISTEN_PORT=80
 
 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +14,15 @@ RUN set -ex; \
         libldap2-dev \
         libfreetype6-dev \
         libjpeg-dev \
+        libonig-dev \
         zlib1g-dev \
         libc-client-dev \
         libkrb5-dev \
         libpng-dev \
         libpq-dev \
+        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
         netcat \
         curl \
         \
@@ -29,7 +35,7 @@ RUN set -ex; \
 
 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         exif \
@@ -41,6 +47,8 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
+        sodium \
+        tidy \
         zip
 
 ENV LIMESURVEY_VERSION=$version
@@ -59,16 +67,16 @@ RUN a2enmod headers rewrite remoteip; \
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
 # Download, unzip and chmod LimeSurvey from official GitHub repository
-RUN curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz
-
 RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
         rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R www-data:www-data /var/www/html
+        chown -R www-data:www-data /var/www/html /etc/apache2
 
+WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
-
+USER $USER
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]

4.0/apache/entrypoint.sh

@@ -20,12 +20,15 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 
+BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
 
 DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
 
+LISTEN_PORT=${LISTEN_PORT:-"80"}
+
 if [ -z "$DB_PASSWORD" ]; then
     echo >&2 'Error: Missing DB_PASSWORD'
     exit 1
@@ -36,6 +39,11 @@ if [ -z "$ADMIN_PASSWORD" ]; then
     exit 1
 fi
 
+if [ "$LISTEN_PORT" != "80" ]; then
+    echo "Info: Customizing Apache Listen port to $LISTEN_PORT"
+    sed -i "s/80/$LISTEN_PORT/" /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf
+fi
+
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
     until nc -z -v -w30 $DB_HOST $DB_PORT
@@ -90,6 +98,9 @@ return array(
       'rules' => array(),
       'showScriptName' => true,
     ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
   ),
   'config'=>array(
     'publicurl'=>'$PUBLIC_URL',

4.0/fpm-alpine/Dockerfile

@@ -1,22 +1,26 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.14+200826'
-ARG sha256_checksum='255f091c47b981ce4905670b49c05cbeeba306253c7454bb49054377ee7bc00a'
+ARG version='4.6.3+210518'
+ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'
 
 # Install OS dependencies
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
         freetype-dev \
         libpng-dev \
+        libzip-dev \
         libjpeg-turbo-dev \
+        tidyhtml-dev \
+        libsodium-dev \
         openldap-dev \
+        oniguruma-dev \
         imap-dev \
         postgresql-dev && \
         apk add --no-cache netcat-openbsd bash
 
 # Install PHP Plugins
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr ; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
         docker-php-ext-configure imap --with-imap-ssl && \
         docker-php-ext-install \
         exif \
@@ -28,12 +32,13 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
+        sodium \
+        tidy \
         zip
 
-# Download, unzip and chmod of LimeSurvey
-RUN curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz
-
+# Download, unzip and chmod LimeSurvey from official GitHub repository
 RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
@@ -47,6 +52,7 @@ RUN set -ex; \
 
 EXPOSE 9000
 
+WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]

4.0/fpm-alpine/entrypoint.sh

@@ -20,6 +20,7 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 
+BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
 
@@ -90,6 +91,9 @@ return array(
       'rules' => array(),
       'showScriptName' => true,
     ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
   ),
   'config'=>array(
     'publicurl'=>'$PUBLIC_URL',

4.0/fpm/Dockerfile

@@ -1,7 +1,7 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.14+200826'
-ARG sha256_checksum='255f091c47b981ce4905670b49c05cbeeba306253c7454bb49054377ee7bc00a'
+ARG version='4.6.3+210518'
+ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,15 @@ RUN set -ex; \
         libldap2-dev \
         libfreetype6-dev \
         libjpeg-dev \
+        libonig-dev \
         zlib1g-dev \
         libc-client-dev \
         libkrb5-dev \
         libpng-dev \
         libpq-dev \
+        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
         netcat \
         \
         && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +32,7 @@ RUN set -ex; \
 
 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         exif \
@@ -40,14 +44,15 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
+        sodium \
+        tidy \
         zip
 
 ENV LIMESURVEY_VERSION=$version
 
 # Download, unzip and chmod LimeSurvey from official GitHub repository
-RUN curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz
-
 RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
@@ -56,6 +61,7 @@ RUN set -ex; \
 
 EXPOSE 9000
 
+WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]

4.0/fpm/entrypoint.sh

@@ -20,6 +20,7 @@ ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
 ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 
+BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
 
@@ -90,6 +91,9 @@ return array(
       'rules' => array(),
       'showScriptName' => true,
     ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
   ),
   'config'=>array(
     'publicurl'=>'$PUBLIC_URL',

5.0/apache/Dockerfile

@@ -0,0 +1,84 @@
+FROM php:8-apache
+LABEL maintainer="markus@martialblog.de"
+ARG version='5.0.0+210526'
+ARG sha256_checksum='b82edc84970b438fdcc63880bb4dee74ee5afb61540f25be8c84a102881c2bc0'
+ARG USER=www-data
+ARG LISTEN_PORT=8080
+
+# Install OS dependencies
+RUN set -ex; \
+        apt-get update && \
+        DEBIAN_FRONTEND=noninteractive \
+        apt-get install --no-install-recommends -y \
+        \
+        libldap2-dev \
+        libfreetype6-dev \
+        libjpeg-dev \
+        libonig-dev \
+        zlib1g-dev \
+        libc-client-dev \
+        libkrb5-dev \
+        libpng-dev \
+        libpq-dev \
+        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
+        netcat \
+        curl \
+        \
+        && apt-get -y autoclean; apt-get -y autoremove; \
+        rm -rf /var/lib/apt/lists/*
+
+# Link LDAP library for PHP ldap extension
+RUN set -ex; \
+        ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/
+
+# Install PHP Plugins and Configure PHP imap plugin
+RUN set -ex; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+        docker-php-ext-install -j5 \
+        exif \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        sodium \
+        tidy \
+        zip
+
+ENV LIMESURVEY_VERSION=$version
+
+# Apache configuration
+RUN a2enmod headers rewrite remoteip; \
+        {\
+        echo RemoteIPHeader X-Real-IP ;\
+        echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
+        echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
+        echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
+        } > /etc/apache2/conf-available/remoteip.conf;\
+        a2enconf remoteip
+
+# Use the default production configuration
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+# Download, unzip and chmod LimeSurvey from official GitHub repository
+RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        rm -f "/tmp/limesurvey.tar.gz" && \
+        chown -R "$USER:$USER" /var/www/html /etc/apache2
+
+EXPOSE $LISTEN_PORT
+
+WORKDIR /var/www/html
+COPY entrypoint.sh entrypoint.sh
+USER $USER
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["apache2-foreground"]

5.0/apache/entrypoint.sh

@@ -0,0 +1,151 @@
+#!/bin/bash
+# Entrypoint for Docker Container
+
+
+DB_TYPE=${DB_TYPE:-'mysql'}
+DB_HOST=${DB_HOST:-'mysql'}
+DB_PORT=${DB_PORT:-'3306'}
+DB_SOCK=${DB_SOCK:-}
+DB_NAME=${DB_NAME:-'limesurvey'}
+DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
+DB_USERNAME=${DB_USERNAME:-'limesurvey'}
+DB_PASSWORD=${DB_PASSWORD:-}
+
+ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+
+BASE_URL=${BASE_URL:-}
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
+
+DEBUG=${DEBUG:-0}
+DEBUG_SQL=${DEBUG_SQL:-0}
+
+LISTEN_PORT=${LISTEN_PORT:-"8080"}
+
+if [ -z "$DB_PASSWORD" ]; then
+    echo >&2 'Error: Missing DB_PASSWORD'
+    exit 1
+fi
+
+if [ -z "$ADMIN_PASSWORD" ]; then
+    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    exit 1
+fi
+
+if [ "$LISTEN_PORT" != "80" ]; then
+    echo "Info: Customizing Apache Listen port to $LISTEN_PORT"
+    sed -i "s/80/$LISTEN_PORT/" /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf
+fi
+
+# Check if database is available
+if [ -z "$DB_SOCK" ]; then
+    until nc -z -v -w30 $DB_HOST $DB_PORT
+    do
+        echo "Info: Waiting for database connection..."
+        sleep 5
+    done
+fi
+
+# Check if config already provisioned
+if [ -f application/config/config.php ]; then
+    echo 'Info: config.php already provisioned'
+else
+    echo 'Info: Generating config.php'
+
+    if [ "$DB_TYPE" = 'mysql' ]; then
+        echo 'Info: Using MySQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8mb4'}
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+    fi
+
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        DB_CONNECT='unix_socket'
+    else
+        echo 'Info: Using TCP connection'
+        DB_CONNECT='host'
+    fi
+
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+    fi
+
+    cat <<EOF > application/config/config.php
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+return array(
+  'components' => array(
+    'db' => array(
+      'connectionString' => '$DB_TYPE:$DB_CONNECT=$DB_HOST;port=$DB_PORT;dbname=$DB_NAME;',
+      'emulatePrepare' => true,
+      'username' => '$DB_USERNAME',
+      'password' => '$DB_PASSWORD',
+      'charset' => '$DB_CHARSET',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
+    ),
+    'urlManager' => array(
+      'urlFormat' => '$URL_FORMAT',
+      'rules' => array(),
+      'showScriptName' => $SHOW_SCRIPT_NAME,
+    ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
+  ),
+  'config'=>array(
+    'publicurl'=>'$PUBLIC_URL',
+    'debug'=>$DEBUG,
+    'debugsql'=>$DEBUG_SQL,
+  )
+);
+
+EOF
+
+fi
+
+# Check if security config already provisioned
+if [ -f application/config/security.php ]; then
+    echo 'Info: security.php already provisioned'
+else
+    echo 'Info: Creating security.php'
+    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
+
+        cat <<EOF > application/config/security.php
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+\$config = array();
+\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
+\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
+\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
+return \$config;
+EOF
+    else
+        echo >&2 'Warning: No encryption keys were provided'
+        echo >&2 'Warning: A security.php config will be created by the application'
+        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
+    fi
+fi
+
+# Check if LimeSurvey database is provisioned
+echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
+php application/commands/console.php updatedb
+
+if [ $? -eq 0 ]; then
+    echo 'Info: Database already provisioned'
+else
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

5.0/fpm-alpine/Dockerfile

@@ -0,0 +1,60 @@
+FROM php:8-fpm-alpine
+LABEL maintainer="markus@martialblog.de"
+ARG version='5.0.0+210526'
+ARG sha256_checksum='b82edc84970b438fdcc63880bb4dee74ee5afb61540f25be8c84a102881c2bc0'
+ARG USER=www-data
+
+# Install OS dependencies
+RUN set -ex; \
+        apk add --no-cache --virtual .build-deps \
+        freetype-dev \
+        libpng-dev \
+        libzip-dev \
+        libjpeg-turbo-dev \
+        tidyhtml-dev \
+        libsodium-dev \
+        openldap-dev \
+        oniguruma-dev \
+        imap-dev \
+        postgresql-dev && \
+        apk add --no-cache netcat-openbsd bash
+
+# Install PHP Plugins
+RUN set -ex; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
+        docker-php-ext-configure imap --with-imap-ssl && \
+        docker-php-ext-install \
+        exif \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        sodium \
+        tidy \
+        zip
+
+# Download, unzip and chmod LimeSurvey from official GitHub repository
+RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        \
+        rm -rf "/tmp/limesurvey.tar.gz" \
+        /var/www/html/docs \
+        /var/www/html/tests \
+        /var/www/html/*.md && \
+        chown -R "${USER}:root" /var/www/ ; \
+        chmod -R g=u /var/www
+
+EXPOSE 9000
+
+WORKDIR /var/www/html
+COPY entrypoint.sh entrypoint.sh
+USER $USER
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["php-fpm"]

5.0/fpm-alpine/entrypoint.sh

@@ -0,0 +1,144 @@
+#!/bin/bash
+# Entrypoint for Docker Container
+
+
+DB_TYPE=${DB_TYPE:-'mysql'}
+DB_HOST=${DB_HOST:-'mysql'}
+DB_PORT=${DB_PORT:-'3306'}
+DB_SOCK=${DB_SOCK:-}
+DB_NAME=${DB_NAME:-'limesurvey'}
+DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
+DB_USERNAME=${DB_USERNAME:-'limesurvey'}
+DB_PASSWORD=${DB_PASSWORD:-}
+
+ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+
+BASE_URL=${BASE_URL:-}
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
+
+DEBUG=${DEBUG:-0}
+DEBUG_SQL=${DEBUG_SQL:-0}
+
+if [ -z "$DB_PASSWORD" ]; then
+    echo >&2 'Error: Missing DB_PASSWORD'
+    exit 1
+fi
+
+if [ -z "$ADMIN_PASSWORD" ]; then
+    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    exit 1
+fi
+
+# Check if database is available
+if [ -z "$DB_SOCK" ]; then
+    until nc -z -v -w30 $DB_HOST $DB_PORT
+    do
+        echo "Info: Waiting for database connection..."
+        sleep 5
+    done
+fi
+
+# Check if config already provisioned
+if [ -f application/config/config.php ]; then
+    echo 'Info: config.php already provisioned'
+else
+    echo 'Info: Generating config.php'
+
+    if [ "$DB_TYPE" = 'mysql' ]; then
+        echo 'Info: Using MySQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8mb4'}
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+    fi
+
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        DB_CONNECT='unix_socket'
+    else
+        echo 'Info: Using TCP connection'
+        DB_CONNECT='host'
+    fi
+
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+    fi
+
+    cat <<EOF > application/config/config.php
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+return array(
+  'components' => array(
+    'db' => array(
+      'connectionString' => '$DB_TYPE:$DB_CONNECT=$DB_HOST;port=$DB_PORT;dbname=$DB_NAME;',
+      'emulatePrepare' => true,
+      'username' => '$DB_USERNAME',
+      'password' => '$DB_PASSWORD',
+      'charset' => '$DB_CHARSET',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
+    ),
+    'urlManager' => array(
+      'urlFormat' => '$URL_FORMAT',
+      'rules' => array(),
+      'showScriptName' => $SHOW_SCRIPT_NAME,
+    ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
+  ),
+  'config'=>array(
+    'publicurl'=>'$PUBLIC_URL',
+    'debug'=>$DEBUG,
+    'debugsql'=>$DEBUG_SQL,
+  )
+);
+
+EOF
+
+fi
+
+# Check if security config already provisioned
+if [ -f application/config/security.php ]; then
+    echo 'Info: security.php already provisioned'
+else
+    echo 'Info: Creating security.php'
+    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
+
+        cat <<EOF > application/config/security.php
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+\$config = array();
+\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
+\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
+\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
+return \$config;
+EOF
+    else
+        echo >&2 'Warning: No encryption keys were provided'
+        echo >&2 'Warning: A security.php config will be created by the application'
+        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
+    fi
+fi
+
+# Check if LimeSurvey database is provisioned
+echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
+php application/commands/console.php updatedb
+
+if [ $? -eq 0 ]; then
+    echo 'Info: Database already provisioned'
+else
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

5.0/fpm/Dockerfile

@@ -0,0 +1,69 @@
+FROM php:8-fpm
+LABEL maintainer="markus@martialblog.de"
+ARG version='5.0.0+210526'
+ARG sha256_checksum='b82edc84970b438fdcc63880bb4dee74ee5afb61540f25be8c84a102881c2bc0'
+ARG USER=www-data
+
+# Install OS dependencies
+RUN set -ex; \
+        apt-get update && \
+        DEBIAN_FRONTEND=noninteractive \
+        apt-get install --no-install-recommends -y \
+        \
+        libldap2-dev \
+        libfreetype6-dev \
+        libjpeg-dev \
+        libonig-dev \
+        zlib1g-dev \
+        libc-client-dev \
+        libkrb5-dev \
+        libpng-dev \
+        libpq-dev \
+        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
+        netcat \
+        \
+        && apt-get -y autoclean; apt-get -y autoremove; \
+        rm -rf /var/lib/apt/lists/*
+
+# Link LDAP library for PHP ldap extension
+RUN set -ex; \
+        ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/
+
+# Install PHP Plugins and Configure PHP imap plugin
+RUN set -ex; \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+        docker-php-ext-install -j5 \
+        exif \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        sodium \
+        tidy \
+        zip
+
+ENV LIMESURVEY_VERSION=$version
+
+# Download, unzip and chmod LimeSurvey from official GitHub repository
+RUN set -ex; \
+        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        rm -f "/tmp/limesurvey.tar.gz" && \
+        chown -R "$USER:$USER" /var/www/html
+
+EXPOSE 9000
+
+WORKDIR /var/www/html
+COPY entrypoint.sh entrypoint.sh
+USER $USER
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["php-fpm"]

5.0/fpm/entrypoint.sh

@@ -0,0 +1,144 @@
+#!/bin/bash
+# Entrypoint for Docker Container
+
+
+DB_TYPE=${DB_TYPE:-'mysql'}
+DB_HOST=${DB_HOST:-'mysql'}
+DB_PORT=${DB_PORT:-'3306'}
+DB_SOCK=${DB_SOCK:-}
+DB_NAME=${DB_NAME:-'limesurvey'}
+DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
+DB_USERNAME=${DB_USERNAME:-'limesurvey'}
+DB_PASSWORD=${DB_PASSWORD:-}
+
+ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+
+BASE_URL=${BASE_URL:-}
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
+
+DEBUG=${DEBUG:-0}
+DEBUG_SQL=${DEBUG_SQL:-0}
+
+if [ -z "$DB_PASSWORD" ]; then
+    echo >&2 'Error: Missing DB_PASSWORD'
+    exit 1
+fi
+
+if [ -z "$ADMIN_PASSWORD" ]; then
+    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    exit 1
+fi
+
+# Check if database is available
+if [ -z "$DB_SOCK" ]; then
+    until nc -z -v -w30 $DB_HOST $DB_PORT
+    do
+        echo "Info: Waiting for database connection..."
+        sleep 5
+    done
+fi
+
+# Check if config already provisioned
+if [ -f application/config/config.php ]; then
+    echo 'Info: config.php already provisioned'
+else
+    echo 'Info: Generating config.php'
+
+    if [ "$DB_TYPE" = 'mysql' ]; then
+        echo 'Info: Using MySQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8mb4'}
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+    fi
+
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        DB_CONNECT='unix_socket'
+    else
+        echo 'Info: Using TCP connection'
+        DB_CONNECT='host'
+    fi
+
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+    fi
+
+    cat <<EOF > application/config/config.php
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+return array(
+  'components' => array(
+    'db' => array(
+      'connectionString' => '$DB_TYPE:$DB_CONNECT=$DB_HOST;port=$DB_PORT;dbname=$DB_NAME;',
+      'emulatePrepare' => true,
+      'username' => '$DB_USERNAME',
+      'password' => '$DB_PASSWORD',
+      'charset' => '$DB_CHARSET',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
+    ),
+    'urlManager' => array(
+      'urlFormat' => '$URL_FORMAT',
+      'rules' => array(),
+      'showScriptName' => $SHOW_SCRIPT_NAME,
+    ),
+    'request' => array(
+      'baseUrl' => '$BASE_URL',
+     ),
+  ),
+  'config'=>array(
+    'publicurl'=>'$PUBLIC_URL',
+    'debug'=>$DEBUG,
+    'debugsql'=>$DEBUG_SQL,
+  )
+);
+
+EOF
+
+fi
+
+# Check if security config already provisioned
+if [ -f application/config/security.php ]; then
+    echo 'Info: security.php already provisioned'
+else
+    echo 'Info: Creating security.php'
+    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
+
+        cat <<EOF > application/config/security.php
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+\$config = array();
+\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
+\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
+\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
+return \$config;
+EOF
+    else
+        echo >&2 'Warning: No encryption keys were provided'
+        echo >&2 'Warning: A security.php config will be created by the application'
+        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
+    fi
+fi
+
+# Check if LimeSurvey database is provisioned
+echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
+php application/commands/console.php updatedb
+
+if [ $? -eq 0 ]; then
+    echo 'Info: Database already provisioned'
+else
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

Makefile

@@ -0,0 +1,14 @@
+# .PHONY: apache fpm fpm-alpine
+
+apache-lts:
+	docker build --pull -t martialblog/limesurvey:3-apache 3.0/apache
+apache-latest:
+	docker build --pull -t martialblog/limesurvey:5-apache 5.0/apache
+fpm-alpine-lts:
+	docker build --pull -t martialblog/limesurvey:3-fpm-alpine 3.0/fpm-alpine
+fpm-alpine-latest:
+	docker build --pull -t martialblog/limesurvey:5-fpm-alpine 5.0/fpm-alpine
+fpm-lts:
+	docker build --pull -t martialblog/limesurvey:3-fpm 3.0/fpm
+fpm-latest:
+	docker build --pull -t martialblog/limesurvey:5-fpm 5.0/fpm

README.md

@@ -1,27 +1,46 @@
-[![Build Status](https://travis-ci.org/martialblog/docker-limesurvey.svg?branch=master)](https://travis-ci.org/martialblog/docker-limesurvey)
+[![Build Status](https://travis-ci.com/martialblog/docker-limesurvey.svg?branch=master)](https://travis-ci.com/martialblog/docker-limesurvey)
 [![](https://images.microbadger.com/badges/image/martialblog/limesurvey.svg)](https://microbadger.com/images/martialblog/limesurvey "Get your own image badge on microbadger.com")
 
 # LimeSurvey Docker
 
 Dockerfile to build a [LimeSurvey](https://limesurvey.org) Image for the Docker container platform.
 
-# Using the apache image
+## Quick reference
 
-The apache image comes with an Apache Webserver and PHP installed.
+- **Maintained by:** https://github.com/martialblog/
+- **Where to get help:** [GitHub Issues](https://github.com/martialblog/docker-limesurvey/issues)
 
-# Apache Configuration
+## Supported tags and respective Dockerfile links
+
+- [`5-apache`, `5.<BUILD-NUMBER>-apache`, `latest` ](https://github.com/martialblog/docker-limesurvey/blob/master/5.0/apache/Dockerfile)
+- [`5-fpm`, `5.<BUILD-NUMBER>-fpm`](https://github.com/martialblog/docker-limesurvey/blob/master/5.0/fpm/Dockerfile)
+- [`5-fpm-alpine`, `5.<BUILD-NUMBER>-fpm-alpine`](https://github.com/martialblog/docker-limesurvey/blob/master/5.0/fpm-alpine/Dockerfile)
+- [`3-apache`, `3.<BUILD-NUMBER>-apache`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/apache/Dockerfile)
+- [`3-fpm`, `3.<BUILD-NUMBER>-fpm`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/fpm/Dockerfile)
+- [`3-fpm-alpine`, `3.<BUILD-NUMBER>-fpm-alpine`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/fpm-alpine/Dockerfile)
+
+# Using the Apache Image
+
+The `apache` image comes with an Apache Webserver and PHP installed.
+
+This image is also available in a `rootless` variant with `www-data` as default user and Apache listening on 8080. Starting from 5.0, the `rootless` variant is the default for Apache images.
+
+## Apache Configuration
 
 To change to Apache Webserver configuration, mount a Volume into the Container at:
 
- - /etc/apache2/sites-available/000-default.conf
+ - `/etc/apache2/sites-available/000-default.conf`
 
 See the example configuration provided.
 
-# Using the fpm image
+The Apache port can be specified by setting the environment variable `LISTEN_PORT` (e.g. `LISTEN_PORT=8080`). Starting from 5.0, Apache defaults to listening on a non-privilged port (8080) in inside the container.
+
+# 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. See *docker-compose.fpm.yml* for example.
 
-# Using the fpm image with https
+## Using the fpm Image with HTTPS
+
 If you would like to run the fpm setup with https, you can get a free certificate from Letsencrypt. As an example, the configuration in *docker-compose.fpm-certbot.yml*
 will take care of getting a certificate and installing it. Please note that you will have to adjust the domain name in the file *examples/nginx-certbot.conf* to match
 the domain used in the *HOSTNAMES* variable in the docker-compose configuration file. If you added both the a domain and the hostname *www* within the domain,
@@ -36,11 +55,11 @@ LimeSurvey requires an external database (MySQL, PostgreSQL) to run. See *docker
 
 To preserve the uploaded files assign the upload folder into a volume. See *docker-compose.yml* for example.
 
-Path: */var/www/html/upload/surveys*
+Path: `/var/www/html/upload/surveys`
 
 **Hint**: The mounted directory must be owned by the webserver user (e.g. www-data)
 
-# LimeSurvey Configuration
+# LimeSurvey configuration
 
 The entrypoint will create a new config.php if none is provided and run the LimeSurvey command line interface for installation.
 
@@ -48,20 +67,31 @@ The entrypoint will create a new config.php if none is provided and run the Lime
 
 To change to LimeSurvey configuration, you can mount a Volume into the Container at:
 
- - /my-data/config.php:/var/www/html/application/config/config.php
+ - `/my-data/config.php:/var/www/html/application/config/config.php`
 
 **Hint**: If this configuration is present before the installation, the LimeSurvey Web Installer will not run automatically.
 
-## Data Encryption
+## Data encryption
 
-LimeSurvey 4 supports data encryption, this image give you these options:
+LimeSurvey version 4.0 and newer support data encryption, this image give you these options:
 
 * Provide a security.php file directly (volume)
-* Provide encryption keys for the security.php file (environment variables)
-* Provide nothing and get a non-persistent security.php file
+* Provide encryption keys for the `security.php` file (environment variables)
+* Provide nothing and get a non-persistent `security.php` file
 
 For further details on the settings see: https://manual.limesurvey.org/Data_encryption
 
+# Reverse Proxy configuration
+
+## Traefik example
+
+```
+# BASE_URL = /limesurvey
+"traefik.http.routers.limesurvey.rule=PathPrefix(`/limesurvey`)",
+"traefik.http.routers.limesurvey.middlewares=strip-limesurvey@docker",
+"traefik.http.middlewares.strip-limesurvey.stripprefix.prefixes=/limesurvey",
+```
+
 # Environment Variables
 
 | Parameter       | Description                               |
@@ -79,16 +109,19 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 | ADMIN_EMAIL     | Initial LimeSurvey Admin Email            |
 | ADMIN_PASSWORD  | Initial LimeSurvey Admin Password         |
 | PUBLIC_URL      | Public URL for public scripts             |
+| BASE_URL        | Application Base URL                      |
 | URL_FORMAT      | URL Format. path or get                   |
+| SHOW_SCRIPT_NAME | Script name in URL (true|false). Default: true |
 | DEBUG           | Debug level (0, 1, 2). Default: 0         |
 | DEBUG_SQL       | SQL Debug level (0, 1, 2). Default 0      |
 | ENCRYPT_KEYPAIR  | Data encryption keypair                  |
 | ENCRYPT_PUBLIC_KEY | Data encryption public key             |
-| ENCRYPY_SECRET_KEY | Data encryption secret key             |
+| ENCRYPT_SECRET_KEY | Data encryption secret key             |
+| LISTEN_PORT     | Apache: Listen port. Default: 8080        |
 
 For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
 
-# Running this image with docker-compose
+# Running this Image with docker-compose
 
 The easiest way to get a fully featured and functional setup is using a docker-compose file. Several examples are provided in the [repository](https://github.com/martialblog/docker-limesurvey).
 
@@ -102,6 +135,42 @@ http://localhost:8080/
 http://localhost:8080/index.php/admin
 ```
 
+# Upgrade Guide
+
+These guides are only referring to the Docker Image, for details on the application users should consult the [official LimeSurvey documentation](https://manual.limesurvey.org/Upgrading_from_a_previous_version) for details.
+
+## Upgrading the FPM Images
+
+If you are using docker-compose to run the FPM Images, you need to stop the application and webserver Containers and delete the application volume:
+
+```
+$ docker volume ls
+DRIVER    VOLUME NAME
+local     docker-limesurvey_lime
+
+$ docker volume rm docker-limesurvey_lime
+```
+
+## Upgrading to 5.0 from 4.x
+
+The default user in the Container will now be *www-data* (uid 33 in Debian, uid 82 in Alpine), any volumes mounted need the corresponding permissions:
+
+```
+# Debian
+$ ls -ln upload/
+total 4
+drwxr-xr-x 3 33 33 4096 Jun  3 13:51 surveys
+```
+
+```
+# Alpine
+$ ls -ln upload/
+total 4
+drwxr-xr-x 3 82 82 4096 Jun  3 13:51 surveys
+```
+
+If you are using the Apache2 Images, the default port will now be **8080**. Depending on your setup the port configurations might need adjustment.
+
 # References
 
 - https://www.limesurvey.org/

docker-compose.example.yml

@@ -6,7 +6,7 @@ services:
     environment:
       - DB_TYPE=pgsql
       - DB_PORT=5432
-      - DB_HOST=limesurvey_db_1.limesurvey_default
+      - DB_HOST=db
       - DB_PASSWORD=example
       - DB_NAME=limesurvey
       - DB_USERNAME=limesurvey
@@ -18,12 +18,14 @@ services:
     volumes:
       - limesurvey:/var/www/html/upload/surveys
     ports:
-      - 8080:80
+      - 8080:8080
     depends_on:
       - db
   db:
-    image: postgres:9.6-alpine
+    image: postgres:10-alpine
     restart: always
+    volumes:
+      - db-data:/var/lib/postgresql
     environment:
       - POSTGRES_USER=limesurvey
       - POSTGRES_DB=limesurvey
@@ -31,3 +33,4 @@ services:
 
 volumes:
   limesurvey:
+  db-data:

docker-compose.fpm-certbot.yml

@@ -2,9 +2,10 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 4.0/fpm/
+      context: 5.0/fpm/
       dockerfile: Dockerfile
     volumes:
+      # Hint: This is just an example, change /tmp to something persistent
       - /tmp/upload/surveys:/var/www/html/upload/surveys
       - lime:/var/www/html
     links:

docker-compose.fpm.alpine.yml

@@ -2,9 +2,10 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 4.0/fpm-alpine/
+      context: 5.0/fpm-alpine/
       dockerfile: Dockerfile
     volumes:
+      # Hint: This is just an example, change /tmp to something persistent
       - /tmp/upload/surveys:/var/www/html/upload/surveys
       - lime:/var/www/html
     links:
@@ -12,7 +13,7 @@ services:
     depends_on:
       - lime-db
     environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-web:

docker-compose.fpm.yml

@@ -2,9 +2,10 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 4.0/fpm/
+      context: 5.0/fpm/
       dockerfile: Dockerfile
     volumes:
+      # Hint: This is just an example, change /tmp to something persistent
       - /tmp/upload/surveys:/var/www/html/upload/surveys
       - lime:/var/www/html
     links:
@@ -12,7 +13,7 @@ services:
     depends_on:
       - lime-db
     environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-web:

docker-compose.pgsql.yml

@@ -2,25 +2,31 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 4.0/apache/
+      context: 5.0/apache/
       dockerfile: Dockerfile
     volumes:
+      # Hint: This is just an example, change /tmp to something persistent
       - /tmp/upload/surveys:/var/www/html/upload/surveys
     links:
       - lime-db
     depends_on:
       - lime-db
     ports:
-      - "8080:80"
+      - "8080:8080"
     environment:
       - "DB_TYPE=pgsql"
       - "DB_PORT=5432"
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-db:
     image: postgres:10
+    volumes:
+      - db-data:/var/lib/postgresql
     environment:
       - "POSTGRES_USER=limesurvey"
       - "POSTGRES_DB=limesurvey"
       - "POSTGRES_PASSWORD=secret"
+
+volumes:
+  db-data:

docker-compose.yml

@@ -2,18 +2,19 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 4.0/apache/
+      context: 5.0/apache/
       dockerfile: Dockerfile
     volumes:
+      # Hint: This is just an example, change /tmp to something persistent
       - /tmp/upload/surveys:/var/www/html/upload/surveys
     links:
       - lime-db
     depends_on:
       - lime-db
     ports:
-      - "8080:80"
+      - "8080:8080"
     environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-db:

examples/apache-example.conf

@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
 	ServerAdmin foo@bar.com
 	DocumentRoot /var/www/html
         Alias /lime "/var/www/html"

makefile

@@ -1,14 +0,0 @@
-.PHONY: apache fpm fpm-alpine
-
-apache:
-	docker build --pull -t limesurvey:apache 3.0/apache
-apache4:
-	docker build --pull -t limesurvey:apache 4.0/apache
-fpm-alpine:
-	docker build --pull -t limesurvey:fpm-alpine 3.0/fpm-alpine
-fpm-alpine4:
-	docker build --pull -t limesurvey:fpm-alpine 4.0/fpm-alpine
-fpm:
-	docker build --pull -t limesurvey:fpm 3.0/fpm
-fpm4:
-	docker build --pull -t limesurvey:fpm 4.0/fpm

nginx-certbot/Dockerfile

@@ -1,10 +1,14 @@
-FROM nginx
-RUN apt-get update && \
-    apt-get install -y certbot curl python-certbot-nginx && \
-    apt-get -y autoclean; apt-get -y autoremove; \
-    rm -rf /var/lib/apt/lists/*
+FROM nginx:stable
+LABEL maintainer="markus@martialblog.de"
+
+RUN set -ex; \
+        apt-get update && \
+        DEBIAN_FRONTEND=noninteractive \
+        apt-get install --no-install-recommends -y \
+        certbot curl python-certbot-nginx && \
+        apt-get -y autoclean; apt-get -y autoremove; \
+        rm -rf /var/lib/apt/lists/*
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod 700 /entrypoint.sh
-
 CMD ["/entrypoint.sh"]

upgrade.sh

@@ -31,3 +31,5 @@ sed -r -i -e "s/[0-9]+(\.[0-9]+)+\+[0-9]+/$NEW_VERSION/" $MAJOR_VERSION/apache/D
 sed -r -i -e "s/[A-Fa-f0-9]{64}/$SHA256_CHECKSUM/" $MAJOR_VERSION/apache/Dockerfile $MAJOR_VERSION/fpm/Dockerfile $MAJOR_VERSION/fpm-alpine/Dockerfile
 
 # After that, check and commit
+echo "git add 3.0 ; git commit -m 'Upgrading to LTS Version ${NEW_VERSION}' && git tag ${NEW_VERSION}"
+echo "git add 5.0 ; git commit -m 'Upgrading to Version ${NEW_VERSION}' && git tag ${NEW_VERSION}"