Merge pull request #22 from martialblog/lts-refactor

Refactor to support LTS version

.travis.yml

@@ -6,6 +6,8 @@ services:
 matrix:
   include:
     - env: TAG=martialblog/limesurvey-apache
-      script: docker build -q -t $TAG -f apache/Dockerfile . && tests/run.sh $TAG
+      script: cd 3.0/apache; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
     - env: TAG=martialblog/limesurvey-fpm
-      script: docker build -q -t $TAG -f fpm/Dockerfile . && tests/run.sh $TAG
+      script: cd 3.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

3.0/apache/Dockerfile

@@ -0,0 +1,72 @@
+FROM php:7.2-apache
+LABEL maintainer="markus@martialblog.de"
+ARG version='3.22.0+200127'
+ARG sha256_checksum='61f1d6db93746040dc53af04f9c1c8fd48f18cc523c1f377b25a5c94c8c3e467'
+
+# 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 \
+        zlib1g-dev \
+        libc-client-dev \
+        libkrb5-dev \
+        libpng-dev \
+        libpq-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-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+        docker-php-ext-install -j5 \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        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
+ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
+
+RUN set -ex; \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        rm -f "/tmp/${version}.tar.gz" && \
+        chown -R www-data:www-data /var/www/html
+
+COPY entrypoint.sh entrypoint.sh
+
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["apache2-foreground"]

3.0/apache/entrypoint.sh

@@ -0,0 +1,101 @@
+#!/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:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-'-'}
+
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+
+
+# 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 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'}
+        cp application/config/config-sample-mysql.php application/config/config.php
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+        cp application/config/config-sample-pgsql.php application/config/config.php
+    fi
+
+    # Set Database config
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
+    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
+    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
+    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
+    sed -i "s#\('tablePrefix' => \).*,\$#\\1'${DB_TABLE_PREFIX}',#g" application/config/config.php
+
+    # Set URL config
+    sed -i "s#\('urlFormat' => \).*,\$#\\1'${URL_FORMAT}',#g" application/config/config.php
+
+    # Set Public URL
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+        sed -i "s#\('debug'=>0,\)\$#'publicurl'=>'${PUBLIC_URL}',\n\t\t\\1 #g" application/config/config.php
+    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
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

3.0/fpm-alpine/Dockerfile

@@ -0,0 +1,51 @@
+FROM php:7.2-fpm-alpine
+LABEL maintainer="markus@martialblog.de"
+ARG version='3.22.0+200127'
+ARG sha256_checksum='61f1d6db93746040dc53af04f9c1c8fd48f18cc523c1f377b25a5c94c8c3e467'
+
+# Install OS dependencies
+RUN set -ex; \
+        apk add --no-cache --virtual .build-deps \
+        freetype-dev \
+        libpng-dev \
+        libjpeg-turbo-dev \
+        openldap-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 imap --with-imap-ssl && \
+        docker-php-ext-install \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        zip
+
+# Download, unzip and chmod of LimeSurvey
+ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
+
+RUN set -ex; \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        \
+        rm -rf "/tmp/${version}.tar.gz" \
+        /var/www/html/docs \
+        /var/www/html/tests \
+        /var/www/html/*.md && \
+        chown -R www-data:root /var/www/ ; \
+        chmod -R g=u /var/www
+
+EXPOSE 9000
+
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["php-fpm"]

3.0/fpm-alpine/entrypoint.sh

@@ -0,0 +1,101 @@
+#!/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:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-'-'}
+
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+
+
+# 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 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'}
+        cp application/config/config-sample-mysql.php application/config/config.php
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+        cp application/config/config-sample-pgsql.php application/config/config.php
+    fi
+
+    # Set Database config
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
+    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
+    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
+    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
+    sed -i "s#\('tablePrefix' => \).*,\$#\\1'${DB_TABLE_PREFIX}',#g" application/config/config.php
+
+    # Set URL config
+    sed -i "s#\('urlFormat' => \).*,\$#\\1'${URL_FORMAT}',#g" application/config/config.php
+
+    # Set Public URL
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+        sed -i "s#\('debug'=>0,\)\$#'publicurl'=>'${PUBLIC_URL}',\n\t\t\\1 #g" application/config/config.php
+    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
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

3.0/fpm/Dockerfile

@@ -0,0 +1,60 @@
+FROM php:7.2-fpm
+LABEL maintainer="markus@martialblog.de"
+ARG version='3.22.0+200127'
+ARG sha256_checksum='61f1d6db93746040dc53af04f9c1c8fd48f18cc523c1f377b25a5c94c8c3e467'
+
+# 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 \
+        zlib1g-dev \
+        libc-client-dev \
+        libkrb5-dev \
+        libpng-dev \
+        libpq-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-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+        docker-php-ext-install -j5 \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        zip
+
+ENV LIMESURVEY_VERSION=$version
+
+# Download, unzip and chmod LimeSurvey from official GitHub repository
+ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
+
+RUN set -ex; \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        rm -f "/tmp/${version}.tar.gz" && \
+        chown -R www-data:www-data /var/www/html
+
+EXPOSE 9000
+
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["php-fpm"]

3.0/fpm/entrypoint.sh

@@ -0,0 +1,101 @@
+#!/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:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-'-'}
+
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+
+
+# 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 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'}
+        cp application/config/config-sample-mysql.php application/config/config.php
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+        cp application/config/config-sample-pgsql.php application/config/config.php
+    fi
+
+    # Set Database config
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
+    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
+    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
+    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
+    sed -i "s#\('tablePrefix' => \).*,\$#\\1'${DB_TABLE_PREFIX}',#g" application/config/config.php
+
+    # Set URL config
+    sed -i "s#\('urlFormat' => \).*,\$#\\1'${URL_FORMAT}',#g" application/config/config.php
+
+    # Set Public URL
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+        sed -i "s#\('debug'=>0,\)\$#'publicurl'=>'${PUBLIC_URL}',\n\t\t\\1 #g" application/config/config.php
+    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
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

4.0/apache/Dockerfile

@@ -0,0 +1,72 @@
+FROM php:7.2-apache
+LABEL maintainer="markus@martialblog.de"
+ARG version='4.0.1+200120'
+ARG sha256_checksum='7e4695878a77f4a721f36b66fdd14def1d8b479103b1fceabd3071b2b81b869c'
+
+# 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 \
+        zlib1g-dev \
+        libc-client-dev \
+        libkrb5-dev \
+        libpng-dev \
+        libpq-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-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+        docker-php-ext-install -j5 \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        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
+ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
+
+RUN set -ex; \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        rm -f "/tmp/${version}.tar.gz" && \
+        chown -R www-data:www-data /var/www/html
+
+COPY entrypoint.sh entrypoint.sh
+
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["apache2-foreground"]

4.0/apache/entrypoint.sh

@@ -0,0 +1,101 @@
+#!/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:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-'-'}
+
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+
+
+# 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 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'}
+        cp application/config/config-sample-mysql.php application/config/config.php
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+        cp application/config/config-sample-pgsql.php application/config/config.php
+    fi
+
+    # Set Database config
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
+    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
+    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
+    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
+    sed -i "s#\('tablePrefix' => \).*,\$#\\1'${DB_TABLE_PREFIX}',#g" application/config/config.php
+
+    # Set URL config
+    sed -i "s#\('urlFormat' => \).*,\$#\\1'${URL_FORMAT}',#g" application/config/config.php
+
+    # Set Public URL
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+        sed -i "s#\('debug'=>0,\)\$#'publicurl'=>'${PUBLIC_URL}',\n\t\t\\1 #g" application/config/config.php
+    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
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

4.0/fpm-alpine/Dockerfile

@@ -0,0 +1,51 @@
+FROM php:7.2-fpm-alpine
+LABEL maintainer="markus@martialblog.de"
+ARG version='4.0.1+200120'
+ARG sha256_checksum='7e4695878a77f4a721f36b66fdd14def1d8b479103b1fceabd3071b2b81b869c'
+
+# Install OS dependencies
+RUN set -ex; \
+        apk add --no-cache --virtual .build-deps \
+        freetype-dev \
+        libpng-dev \
+        libjpeg-turbo-dev \
+        openldap-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 imap --with-imap-ssl && \
+        docker-php-ext-install \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        zip
+
+# Download, unzip and chmod of LimeSurvey
+ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
+
+RUN set -ex; \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        \
+        rm -rf "/tmp/${version}.tar.gz" \
+        /var/www/html/docs \
+        /var/www/html/tests \
+        /var/www/html/*.md && \
+        chown -R www-data:root /var/www/ ; \
+        chmod -R g=u /var/www
+
+EXPOSE 9000
+
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["php-fpm"]

4.0/fpm-alpine/entrypoint.sh

@@ -0,0 +1,101 @@
+#!/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:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-'-'}
+
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+
+
+# 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 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'}
+        cp application/config/config-sample-mysql.php application/config/config.php
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+        cp application/config/config-sample-pgsql.php application/config/config.php
+    fi
+
+    # Set Database config
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
+    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
+    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
+    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
+    sed -i "s#\('tablePrefix' => \).*,\$#\\1'${DB_TABLE_PREFIX}',#g" application/config/config.php
+
+    # Set URL config
+    sed -i "s#\('urlFormat' => \).*,\$#\\1'${URL_FORMAT}',#g" application/config/config.php
+
+    # Set Public URL
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+        sed -i "s#\('debug'=>0,\)\$#'publicurl'=>'${PUBLIC_URL}',\n\t\t\\1 #g" application/config/config.php
+    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
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

4.0/fpm/Dockerfile

@@ -0,0 +1,60 @@
+FROM php:7.2-fpm
+LABEL maintainer="markus@martialblog.de"
+ARG version='4.0.1+200120'
+ARG sha256_checksum='7e4695878a77f4a721f36b66fdd14def1d8b479103b1fceabd3071b2b81b869c'
+
+# 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 \
+        zlib1g-dev \
+        libc-client-dev \
+        libkrb5-dev \
+        libpng-dev \
+        libpq-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-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+        docker-php-ext-install -j5 \
+        gd \
+        imap \
+        ldap \
+        mbstring \
+        pdo \
+        pdo_mysql \
+        pdo_pgsql \
+        pgsql \
+        zip
+
+ENV LIMESURVEY_VERSION=$version
+
+# Download, unzip and chmod LimeSurvey from official GitHub repository
+ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
+
+RUN set -ex; \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
+        \
+        tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
+        rm -f "/tmp/${version}.tar.gz" && \
+        chown -R www-data:www-data /var/www/html
+
+EXPOSE 9000
+
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
+CMD ["php-fpm"]

4.0/fpm/entrypoint.sh

@@ -0,0 +1,101 @@
+#!/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:-}
+
+ADMIN_USER=${ADMIN_USER:-'admin'}
+ADMIN_NAME=${ADMIN_NAME:-'admin'}
+ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-'-'}
+
+PUBLIC_URL=${PUBLIC_URL:-}
+URL_FORMAT=${URL_FORMAT:-'path'}
+
+
+# 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 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'}
+        cp application/config/config-sample-mysql.php application/config/config.php
+    fi
+
+    if [ "$DB_TYPE" = 'pgsql' ]; then
+        echo 'Info: Using PostgreSQL configuration'
+        DB_CHARSET=${DB_CHARSET:-'utf8'}
+        cp application/config/config-sample-pgsql.php application/config/config.php
+    fi
+
+    # Set Database config
+    if [ ! -z "$DB_SOCK" ]; then
+        echo 'Info: Using unix socket'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:unix_socket=${DB_SOCK};dbname=${DB_NAME};',#g" application/config/config.php
+    else
+        echo 'Info: Using TCP connection'
+        sed -i "s#\('connectionString' => \).*,\$#\\1'${DB_TYPE}:host=${DB_HOST};port=${DB_PORT};dbname=${DB_NAME};',#g" application/config/config.php
+    fi
+
+    sed -i "s#\('username' => \).*,\$#\\1'${DB_USERNAME}',#g" application/config/config.php
+    sed -i "s#\('password' => \).*,\$#\\1'${DB_PASSWORD}',#g" application/config/config.php
+    sed -i "s#\('charset' => \).*,\$#\\1'${DB_CHARSET}',#g" application/config/config.php
+    sed -i "s#\('tablePrefix' => \).*,\$#\\1'${DB_TABLE_PREFIX}',#g" application/config/config.php
+
+    # Set URL config
+    sed -i "s#\('urlFormat' => \).*,\$#\\1'${URL_FORMAT}',#g" application/config/config.php
+
+    # Set Public URL
+    if [ -z "$PUBLIC_URL" ]; then
+        echo 'Info: Setting PublicURL'
+        sed -i "s#\('debug'=>0,\)\$#'publicurl'=>'${PUBLIC_URL}',\n\t\t\\1 #g" application/config/config.php
+    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
+    # Check if DB_PASSWORD is set
+    if [ -z "$DB_PASSWORD" ]; then
+        echo >&2 'Error: Missing DB_PASSWORD'
+        exit 1
+    fi
+
+    # Check if DB_PASSWORD is set
+    if [ -z "$ADMIN_PASSWORD" ]; then
+        echo >&2 'Error: Missing ADMIN_PASSWORD'
+        exit 1
+    fi
+
+    echo ''
+    echo 'Running console.php install'
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
+fi
+
+exec "$@"

README.md

@@ -11,7 +11,7 @@ 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:
+To change to Apache Webserver configuration, mount a Volume into the Container at:
 
  - /etc/apache2/sites-available/000-default.conf
 
@@ -19,7 +19,7 @@ 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.
+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 an external database
 
@@ -27,15 +27,56 @@ LimeSurvey requires an external database (MySQL, PostgreSQL) to run. See *docker
 
 # Persistent data
 
-To preserve the uploaded files assign the upload folder into a volume. See *docker-compose.yml* for details.
+To preserve the uploaded files assign the upload folder into a volume. See *docker-compose.yml* for example.
+
+Path: */var/www/html/upload/surveys*
+
+**Hint**: The mounted directory must be owned by the webserver user (e.g. www-data)
 
 # LimeSurvey Configuration
 
-To change to LimeSurvey configuration simply mount a Volume into the Container at:
+The entrypoint will create a new config.php if none is provided and run the LimeSurvey command line interface for installation.
+
+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
 
-**Hint**: If this configuration is present, the LimeSurvey Installer will not run.
+**Hint**: If this configuration is present before the installation, the LimeSurvey Web Installer will not run automatically.
+
+# Environment Variables
+
+| Parameter       | Description                               |
+| ---------       | -----------                               |
+| DB_TYPE         | Database Type to use. mysql or pgsql      |
+| DB_HOST         | Database server hostname                  |
+| DB_PORT         | Database server port                      |
+| DB_SOCK         | Database unix socket instead of host/port |
+| DB_NAME         | Database name                             |
+| DB_TABLE_PREFIX | Database table prefix                     |
+| DB_USERNAME     | Database user                             |
+| DB_PASSWORD     | Database user's password                  |
+| ADMIN_USER      | LimeSurvey Admin User                     |
+| ADMIN_NAME      | LimeSurvey Admin Username                 |
+| ADMIN_EMAIL     | LimeSurvey Admin Email                    |
+| ADMIN_PASSWORD  | LimeSurvey Admin Password                 |
+| PUBLIC_URL      | Public URL for public scripts             |
+| URL_FORMAT      | URL Format. path or get                   |
+
+For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
+
+# 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.
+
+```
+docker-compose up
+
+# Frontend
+http://localhost:8080/
+
+# Backend
+http://localhost:8080/index.php/admin
+```
 
 # References
 

apache/Dockerfile

@@ -1,40 +0,0 @@
-FROM php:7.2-apache
-LABEL maintainer="markus@martialblog.de"
-ARG version='3.7.2+180508'
-
-# Install OS dependencies
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive \
-    apt-get install --no-install-recommends -y \
-    libldap2-dev \
-    zlib1g-dev \
-    libc-client-dev \
-    libkrb5-dev \
-    libpng-dev \
-    libpq-dev \
-    && apt-get autoclean; apt-get autoremove && \
-    rm -rf /var/lib/apt/lists/*
-
-# Link LDAP library for PHP ldap extension
-RUN ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/
-# Configure PHP imap plugin
-RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl
-
-# Install PHP Plugins
-RUN docker-php-ext-install -j5 \
-    gd \
-    imap \
-    ldap \
-    mbstring \
-    pdo \
-    pdo_mysql \
-    pdo_pgsql \
-    pgsql \
-    zip
-
-# Download, unzip and chmod of LimeSurvey
-ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
-
-RUN tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
-    rm "/tmp/${version}.tar.gz" && \
-    chown -R www-data:www-data /var/www/html

docker-compose.fpm.alpine.yml

@@ -0,0 +1,35 @@
+version: "3.0"
+services:
+  limesurvey:
+    build:
+      context: 4.0/fpm-alpine/
+      dockerfile: Dockerfile
+    volumes:
+      - /tmp/upload/surveys:/var/www/html/upload/surveys
+      - lime:/var/www/html
+    links:
+      - lime-db
+    depends_on:
+      - lime-db
+    environment:
+      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_PASSWORD=secret"
+      - "ADMIN_PASSWORD=foobar"
+  lime-web:
+    image: nginx:alpine
+    links:
+      - limesurvey
+    ports:
+      - "8080:80"
+    volumes:
+      - ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
+      - lime:/var/www/html
+  lime-db:
+    image: mysql:5.7
+    environment:
+      - "MYSQL_USER=limesurvey"
+      - "MYSQL_DATABASE=limesurvey"
+      - "MYSQL_PASSWORD=secret"
+      - "MYSQL_ROOT_PASSWORD=secret"
+volumes:
+  lime:

docker-compose.fpm.yml

@@ -0,0 +1,35 @@
+version: "3.0"
+services:
+  limesurvey:
+    build:
+      context: 4.0/fpm/
+      dockerfile: Dockerfile
+    volumes:
+      - /tmp/upload/surveys:/var/www/html/upload/surveys
+      - lime:/var/www/html
+    links:
+      - lime-db
+    depends_on:
+      - lime-db
+    environment:
+      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_PASSWORD=secret"
+      - "ADMIN_PASSWORD=foobar"
+  lime-web:
+    image: nginx
+    links:
+      - limesurvey
+    ports:
+      - "8080:80"
+    volumes:
+      - ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
+      - lime:/var/www/html
+  lime-db:
+    image: mysql:5.7
+    environment:
+      - "MYSQL_USER=limesurvey"
+      - "MYSQL_DATABASE=limesurvey"
+      - "MYSQL_PASSWORD=secret"
+      - "MYSQL_ROOT_PASSWORD=secret"
+volumes:
+  lime:

docker-compose.pgsql.yml

@@ -0,0 +1,26 @@
+version: "3.0"
+services:
+  limesurvey:
+    build:
+      context: 4.0/apache/
+      dockerfile: Dockerfile
+    volumes:
+      - /tmp/upload/surveys:/var/www/html/upload/surveys
+    links:
+      - lime-db
+    depends_on:
+      - lime-db
+    ports:
+      - "8080:80"
+    environment:
+      - "DB_TYPE=pgsql"
+      - "DB_PORT=5432"
+      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_PASSWORD=secret"
+      - "ADMIN_PASSWORD=foobar"
+  lime-db:
+    image: postgres:10
+    environment:
+      - "POSTGRES_USER=limesurvey"
+      - "POSTGRES_DB=limesurvey"
+      - "POSTGRES_PASSWORD=secret"

docker-compose.yml

@@ -2,16 +2,20 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: .
+      context: 4.0/apache/
-      dockerfile: apache/Dockerfile
+      dockerfile: Dockerfile
     volumes:
-      - /tmp/upload/:/var/www/html/upload/
+      - /tmp/upload/surveys:/var/www/html/upload/surveys
     links:
       - lime-db
     depends_on:
       - lime-db
     ports:
       - "8080:80"
+    environment:
+      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_PASSWORD=secret"
+      - "ADMIN_PASSWORD=foobar"
   lime-db:
     image: mysql:5.7
     environment:

examples/nginx.conf

@@ -0,0 +1,37 @@
+worker_processes 1;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    server {
+        listen 80;
+        index index.php;
+        set $host_path "/var/www/html";
+        root /var/www/html;
+        server_name localhost;
+        charset utf-8;
+        location / {
+            try_files $uri /index.php?$args;
+        }
+        location ~ ^/(protected|framework|themes/\w+/views) {
+            deny  all;
+        }
+        location ~ \.(js|css|png|jpg|gif|swf|ico|pdf|mov|fla|zip|rar)$ {
+            try_files $uri =404;
+        }
+        location ~ \.php$ {
+            fastcgi_split_path_info  ^(.+\.php)(.*)$;
+            try_files $uri index.php;
+            include fastcgi_params;
+            fastcgi_index index.php;
+            fastcgi_pass  limesurvey:9000;
+            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+            fastcgi_param  SCRIPT_NAME      $fastcgi_script_name;
+        }
+    }
+}

fpm/Dockerfile

@@ -1,40 +0,0 @@
-FROM php:7.2-fpm
-LABEL maintainer="markus@martialblog.de"
-ARG version='3.7.2+180508'
-
-# Install OS dependencies
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive \
-    apt-get install --no-install-recommends -y \
-    libldap2-dev \
-    zlib1g-dev \
-    libc-client-dev \
-    libkrb5-dev \
-    libpng-dev \
-    libpq-dev \
-    && apt-get autoclean; apt-get autoremove && \
-    rm -rf /var/lib/apt/lists/*
-
-# Link LDAP library for PHP ldap extension
-RUN ln -fs /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/
-
-RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl
-
-# Install PHP Plugins
-RUN docker-php-ext-install -j5 \
-    gd \
-    imap \
-    ldap \
-    mbstring \
-    pdo \
-    pdo_mysql \
-    pdo_pgsql \
-    pgsql \
-    zip
-
-# Download, unzip and chmod of LimeSurvey
-ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
-
-RUN tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
-    rm "/tmp/${version}.tar.gz" && \
-    chown -R www-data:www-data /var/www/html

makefile

@@ -0,0 +1,14 @@
+.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

requirements.txt

@@ -1 +0,0 @@
-feedparser==5.2.1

tests/image_tests.yaml

@@ -8,6 +8,9 @@ fileContentTests:
   - name: 'Limesurvey admin file content'
     path: '/var/www/html/admin/index.php'
     expectedContents: ['LimeSurvey']
+  - name: 'Entrypoint file content'
+    path: '/var/www/html/entrypoint.sh'
+    expectedContents: ['console.php', 'ADMIN_USER']
 
 fileExistenceTests:
   - name: 'Limesurvey files'
@@ -47,6 +50,10 @@ fileExistenceTests:
     shouldExist: true
 
 commandTests:
+  - name:  "Dependencies - netcat"
+    command: "dpkg"
+    args: ["-l", "netcat"]
+    exitCode: 0
   - name:  "Dependencies - libldap2-dev"
     command: "dpkg"
     args: ["-l", "libldap2-dev"]

tests/run.sh

@@ -3,7 +3,8 @@
 IMAGE=$1
 
 if [ ! -f container-structure-test ]; then
-   curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test
+   curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64
+   mv container-structure-test-linux-amd64 container-structure-test
    chmod +x container-structure-test
 fi
 

upgrade.py

@@ -1,61 +0,0 @@
-#!/usr/bin/env python3
-
-
-import argparse
-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
-
-argumentparser = argparse.ArgumentParser(description='Updates the LimeSurvey Version in the Dockerfiles')
-argumentparser.add_argument('--noop', dest='noop', action="store_true", required=False, help="Don't push just commit")
-argumentparser.add_argument('--check', dest='check', action="store_true", required=False, help="Only check if there's a new version available")
-
-cmdargs = argumentparser.parse_args()
-
-if limesv_current_release == docker_current_release:
-    print('Nothing to do.')
-    sys.exit(0)
-
-print('New Version {} available.'.format(limesv_current_release))
-
-if cmdargs.check:
-    sys.exit(0)
-
-commit_message = 'Updating 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')
-
-if cmdargs.noop:
-    sys.exit(0)
-
-# 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)

upgrade.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Upgrade script
+
+set -x
+
+if [ $# -eq 0 ]
+  then
+      echo 'Pass new LimeSurvey Version tag:'
+      echo '> upgrade.sh 3.15.8+190130'
+      exit 1
+fi
+
+NEW_VERSION=$1
+MAJOR_VERSION=$(echo $NEW_VERSION | cut -c 1 | awk '{print $1".0"}')
+
+grep -qc $NEW_VERSION $MAJOR_VERSION/apache/Dockerfile $MAJOR_VERSION/fpm/Dockerfile $MAJOR_VERSION/fpm-alpine/Dockerfile
+
+if [ $? -eq 0 ]
+   then
+       echo "Already at version ${NEW_VERSION}"
+       exit 0
+fi
+
+# Download, unzip and chmod LimeSurvey from official GitHub repository
+wget -P /tmp "https://github.com/LimeSurvey/LimeSurvey/archive/${NEW_VERSION}.tar.gz"
+
+SHA256_CHECKSUM=$(sha256sum "/tmp/${NEW_VERSION}.tar.gz" | awk '{ print $1 }')
+
+# Update lines in the files
+sed -r -i -e "s/[0-9]+(\.[0-9]+)+\+[0-9]+/$NEW_VERSION/" $MAJOR_VERSION/apache/Dockerfile $MAJOR_VERSION/fpm/Dockerfile $MAJOR_VERSION/fpm-alpine/Dockerfile
+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