Upgrading to Version 5.4.3+220926

Upgrading to Version 5.4.0+220913

3.0/apache/Dockerfile

@@ -1,9 +1,5 @@
-FROM php:8.0-apache
+FROM docker.io/php:8.0-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.28.8+220426'
-ARG sha256_checksum='9cfe5106b1ef59e243266d89765740b3fb66d452bc6cfc0e6f3926f9ce10c4a0'
-ARG USER=root
-ARG LISTEN_PORT=80
 
 # Install OS dependencies
 RUN set -ex; \
@@ -50,8 +46,6 @@ RUN set -ex; \
         tidy \
         zip
 
-ENV LIMESURVEY_VERSION=$version
-
 # Apache configuration
 RUN a2enmod headers rewrite remoteip; \
         {\
@@ -65,9 +59,16 @@ RUN a2enmod headers rewrite 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
+ARG version="3.28.30+220927"
+ARG sha256_checksum="b4a877384644abb274b6f0700c65b4ec48625c388756d4eff9ba445d081fbc51"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG USER=root
+ARG LISTEN_PORT=80
+ENV LIMESURVEY_VERSION=$version
+
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        curl -sSL "${archive_url}" --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/ && \

3.0/fpm-alpine/Dockerfile

@@ -1,7 +1,5 @@
-FROM php:8.0-fpm-alpine
+FROM docker.io/php:8.0-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.28.8+220426'
-ARG sha256_checksum='9cfe5106b1ef59e243266d89765740b3fb66d452bc6cfc0e6f3926f9ce10c4a0'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -35,9 +33,14 @@ RUN set -ex; \
         tidy \
         zip
 
-# Download, unzip and chmod LimeSurvey from official GitHub repository
+ARG version="3.28.30+220927"
+ARG sha256_checksum="b4a877384644abb274b6f0700c65b4ec48625c388756d4eff9ba445d081fbc51"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ENV LIMESURVEY_VERSION=$version
+
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        curl -sSL "${archive_url}" --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/ && \

3.0/fpm/Dockerfile

@@ -1,7 +1,5 @@
-FROM php:8.0-fpm
+FROM docker.io/php:8.0-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.28.8+220426'
-ARG sha256_checksum='9cfe5106b1ef59e243266d89765740b3fb66d452bc6cfc0e6f3926f9ce10c4a0'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -48,11 +46,14 @@ RUN set -ex; \
         tidy \
         zip
 
+ARG version="3.28.30+220927"
+ARG sha256_checksum="b4a877384644abb274b6f0700c65b4ec48625c388756d4eff9ba445d081fbc51"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ENV LIMESURVEY_VERSION=$version
 
-# Download, unzip and chmod LimeSurvey from official GitHub repository
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        curl -sSL "${archive_url}" --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/ && \

4.0/apache/Dockerfile

@@ -1,82 +0,0 @@
-FROM php:8.0-apache
-LABEL maintainer="markus@martialblog.de"
-ARG version='4.6.3+210518'
-ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'
-ARG USER=root
-ARG LISTEN_PORT=80
-
-# 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 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

@@ -1,154 +0,0 @@
-#!/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:-}
-DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
-
-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
-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/Listen 80\$/Listen $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 [ -n "$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' => true,
-    ),
-    'request' => array(
-      'baseUrl' => '$BASE_URL',
-     ),
-  ),
-  'config'=>array(
-    'publicurl'=>'$PUBLIC_URL',
-    'debug'=>$DEBUG,
-    'debugsql'=>$DEBUG_SQL,
-    'mysqlEngine' => '$DB_MYSQL_ENGINE',
-  )
-);
-
-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 [ -n "$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
-
-PHP_UPDATEDB_EXIT_CODE=$?
-
-if [ $PHP_UPDATEDB_EXIT_CODE -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 "$@"

4.0/fpm-alpine/Dockerfile

@@ -1,58 +0,0 @@
-FROM php:8.0-fpm-alpine
-LABEL maintainer="markus@martialblog.de"
-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=/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 www-data:root /var/www/ ; \
-        chmod -R g=u /var/www
-
-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

@@ -1,147 +0,0 @@
-#!/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:-}
-DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
-
-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}
-
-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 [ -n "$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' => true,
-    ),
-    'request' => array(
-      'baseUrl' => '$BASE_URL',
-     ),
-  ),
-  'config'=>array(
-    'publicurl'=>'$PUBLIC_URL',
-    'debug'=>$DEBUG,
-    'debugsql'=>$DEBUG_SQL,
-    'mysqlEngine' => '$DB_MYSQL_ENGINE',
-  )
-);
-
-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 [ -n "$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
-
-PHP_UPDATEDB_EXIT_CODE=$?
-
-if [ $PHP_UPDATEDB_EXIT_CODE -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 "$@"

4.0/fpm/Dockerfile

@@ -1,67 +0,0 @@
-FROM php:8.0-fpm
-LABEL maintainer="markus@martialblog.de"
-ARG version='4.6.3+210518'
-ARG sha256_checksum='3c59afc13d0cf974c465c5f851cb8837117518e94031f5e3a28ba468ad734ce2'
-
-# 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 www-data:www-data /var/www/html
-
-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

@@ -1,147 +0,0 @@
-#!/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:-}
-DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}
-
-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}
-
-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 [ -n "$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' => true,
-    ),
-    'request' => array(
-      'baseUrl' => '$BASE_URL',
-     ),
-  ),
-  'config'=>array(
-    'publicurl'=>'$PUBLIC_URL',
-    'debug'=>$DEBUG,
-    'debugsql'=>$DEBUG_SQL,
-    'mysqlEngine' => '$DB_MYSQL_ENGINE',
-  )
-);
-
-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 [ -n "$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
-
-PHP_UPDATEDB_EXIT_CODE=$?
-
-if [ $PHP_UPDATEDB_EXIT_CODE -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/apache/Dockerfile

@@ -1,9 +1,5 @@
-FROM php:8.0-apache
+FROM docker.io/php:8.0-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.3.10+220419'
-ARG sha256_checksum='da475e2e97c62fd203ced9c501b023ff2155c602d3948d79180dc25502abbd1a'
-ARG USER=www-data
-ARG LISTEN_PORT=8080
 
 # Install OS dependencies
 RUN set -ex; \
@@ -51,8 +47,6 @@ RUN set -ex; \
         tidy \
         zip
 
-ENV LIMESURVEY_VERSION=$version
-
 # Apache configuration
 RUN a2enmod headers rewrite remoteip; \
         {\
@@ -66,9 +60,16 @@ RUN a2enmod headers rewrite 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
+ARG version="5.4.3+220926"
+ARG sha256_checksum="881629eb8ebacd4dab6b5f3b27178467b837ed71b3c63d7654f9d53b13585134"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG USER=www-data
+ARG LISTEN_PORT=8080
+ENV LIMESURVEY_VERSION=$version
+
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        curl -sSL "${archive_url}" --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/ && \

5.0/fpm-alpine/Dockerfile

@@ -1,8 +1,5 @@
-FROM php:8.0-fpm-alpine
+FROM docker.io/php:8.0-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.3.10+220419'
-ARG sha256_checksum='da475e2e97c62fd203ced9c501b023ff2155c602d3948d79180dc25502abbd1a'
-ARG USER=www-data
 
 # Install OS dependencies
 RUN set -ex; \
@@ -37,9 +34,15 @@ RUN set -ex; \
         tidy \
         zip
 
-# Download, unzip and chmod LimeSurvey from official GitHub repository
+ARG version="5.4.3+220926"
+ARG sha256_checksum="881629eb8ebacd4dab6b5f3b27178467b837ed71b3c63d7654f9d53b13585134"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG USER=www-data
+ENV LIMESURVEY_VERSION=$version
+
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        curl -sSL "${archive_url}" --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/ && \

5.0/fpm/Dockerfile

@@ -1,8 +1,5 @@
-FROM php:8.0-fpm
+FROM docker.io/php:8.0-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.3.10+220419'
-ARG sha256_checksum='da475e2e97c62fd203ced9c501b023ff2155c602d3948d79180dc25502abbd1a'
-ARG USER=www-data
 
 # Install OS dependencies
 RUN set -ex; \
@@ -49,11 +46,15 @@ RUN set -ex; \
         tidy \
         zip
 
+ARG version="5.4.3+220926"
+ARG sha256_checksum="881629eb8ebacd4dab6b5f3b27178467b837ed71b3c63d7654f9d53b13585134"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
 
-# Download, unzip and chmod LimeSurvey from official GitHub repository
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz && \
+        curl -sSL "${archive_url}" --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/ && \

CONTRIBUTING.md

@@ -2,6 +2,15 @@
 
 Every Pull Request is welcome.
 
+## Branches
+Choosing a proper name for a branch helps us identify its purpose and possibly find an associated bug or feature. Generally a branch name should include a topic such as `fix` or `feature` followed by a description. Branches should have only changes relevant to a specific issue.
+
+```
+git checkout -b fix/bug-in-connection
+git checkout -b feature/improved-config-handling
+git checkout -b doc/fix-typo
+```
+
 ## Upgrading the Version
 
 The versions in this repository should correspond to the [GitHub LimeSurvey Releases](https://github.com/LimeSurvey/LimeSurvey/releases)
@@ -12,19 +21,19 @@ To update the version, simply update ARG variables for version and corresponding
 # Version from GitHub Tags
 # sha256 of tar.gz from GitHub Releases
 
-$ grep ARG 4.0/apache/Dockerfile
+$ grep ARG 5.0/apache/Dockerfile
-ARG version='4.3.13+200824'
+ARG version='5.3.13+200824'
 ARG sha256_checksum='4e9c6f20e'
 ```
 
 It is best to use the upgrade shell script:
 
 ```bash
-./upgrade.sh 4.3.13+200824
+./upgrade.sh 5.3.13+200824
 # Check if sha256 is correct
 
-git add 4.0/ && git commit -m 'Upgrading to Version 4.3.13+200824'
+git add 5.0/ && git commit -m 'Upgrading to Version 5.3.13+200824'
-git tag 4.3.13-200824
+git tag 5.3.13-200824
 ```
 
 ## Testing

Makefile

@@ -1,14 +1,14 @@
-# .PHONY: apache fpm fpm-alpine
+RUNTIME?=podman
 
 apache-lts:
-	docker build --pull -t docker.io/martialblog/limesurvey:3-apache 3.0/apache
+	$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:3-apache 3.0/apache
 apache-latest:
-	docker build --pull -t docker.io/martialblog/limesurvey:5-apache 5.0/apache
+	$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:5-apache 5.0/apache
 fpm-alpine-lts:
-	docker build --pull -t docker.io/martialblog/limesurvey:3-fpm-alpine 3.0/fpm-alpine
+	$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:3-fpm-alpine 3.0/fpm-alpine
 fpm-alpine-latest:
-	docker build --pull -t docker.io/martialblog/limesurvey:5-fpm-alpine 5.0/fpm-alpine
+	$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:5-fpm-alpine 5.0/fpm-alpine
 fpm-lts:
-	docker build --pull -t docker.io/martialblog/limesurvey:3-fpm 3.0/fpm
+	$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:3-fpm 3.0/fpm
 fpm-latest:
-	docker build --pull -t docker.io/martialblog/limesurvey:5-fpm 5.0/fpm
+	$(RUNTIME) build --pull -t docker.io/martialblog/limesurvey:5-fpm 5.0/fpm

README.md

@@ -117,7 +117,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 | BASE_URL        | Application Base URL                      |
 | URL_FORMAT      | URL Format. path or get                   |
 | TABLE_SESSION   | Enable table sessions (true)              |
-| SHOW_SCRIPT_NAME | Script name in URL (true|false). Default: true |
+| 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                  |

docker-compose.example.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   limesurvey:
-    image: martialblog/limesurvey:latest
+    image: docker.io/martialblog/limesurvey:latest
     restart: always
     environment:
       - DB_TYPE=pgsql
@@ -22,7 +22,7 @@ services:
     depends_on:
       - db
   db:
-    image: postgres:10-alpine
+    image: docker.io/postgres:10-alpine
     restart: always
     volumes:
       - db-data:/var/lib/postgresql

docker-compose.fpm-certbot.yml

@@ -33,14 +33,14 @@ services:
     environment:
       - "HOSTNAMES=www.example.com example.com"
   certbot:
-    image: certbot/certbot
+    image: docker.io/certbot/certbot
     restart: unless-stopped
     volumes:
       - ./certbot/conf:/etc/letsencrypt
       - ./certbot/www:/var/www/certbot
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
   lime-db:
-    image: mysql:5.7
+    image: docker.io/mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"

docker-compose.fpm.alpine.yml

@@ -17,7 +17,7 @@ services:
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-web:
-    image: nginx:alpine
+    image: docker.io/nginx:alpine
     links:
       - limesurvey
     depends_on:
@@ -28,7 +28,7 @@ services:
       - ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
       - lime:/var/www/html
   lime-db:
-    image: mysql:5.7
+    image: docker.io/mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"

docker-compose.fpm.yml

@@ -17,7 +17,7 @@ services:
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-web:
-    image: nginx
+    image: docker.io/nginx
     links:
       - limesurvey
     ports:
@@ -26,7 +26,7 @@ services:
       - ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
       - lime:/var/www/html
   lime-db:
-    image: mysql:5.7
+    image: docker.io/mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"

docker-compose.pgsql.yml

@@ -22,7 +22,7 @@ services:
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-db:
-    image: postgres:10
+    image: docker.io/postgres:10
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:

docker-compose.traefik.yml

@@ -24,7 +24,7 @@ services:
       - "PUBLIC_URL=http://localhost:8888/limesurvey"
       - "BASE_URL=http://localhost:8888/limesurvey"
   traefik:
-    image: "traefik:v2.5"
+    image: docker.io/traefik:v2.5
     container_name: "traefik"
     command:
       - "--api.insecure=true"
@@ -37,7 +37,7 @@ services:
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
   lime-db:
-    image: mysql:5.7
+    image: docker.io/mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       # If you require an empty table prefix, use a space as the DB_TABLE_PREFIX
       # - "DB_TABLE_PREFIX= "
   lime-db:
-    image: mysql:5.7
+    image: docker.io/mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"