Upgrading to Version 4.3.31+201214

.gitattributes

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

.github/workflows/build-latest-container-images.yaml

@@ -1,103 +0,0 @@
-name: Publish Latest Container Images
-on:
-  push:
-    tags:
-      - '5.*'
-
-jobs:
-  lint_dockerfiles:
-    name: Lint Dockerfile with hadolint
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dockerfile:
-          - 5.0/apache/Dockerfile
-          - 5.0/fpm-alpine/Dockerfile
-          - 5.0/fpm/Dockerfile
-    steps:
-      - uses: actions/checkout@v2
-      - uses: hadolint/hadolint-action@v1.5.0
-        with:
-          dockerfile: ${{ matrix.dockerfile }}
-          ignore: DL4006 DL3008 DL3018
-
-  push_images_to_registries:
-    name: Push Container Images to registries
-    runs-on: ubuntu-latest
-    needs: [lint_dockerfiles]
-    environment: docker-build
-    permissions:
-      packages: write
-      contents: read
-    steps:
-      - name: 'Check out the repo'
-        uses: actions/checkout@v2
-      - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v1
-        with:
-          buildkitd-flags: --debug
-      - name: 'Log in to DockerHub'
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-      - name: 'Apache variant metadata'
-        id: metadata-apache
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            docker.io/martialblog/limesurvey
-          tags: |
-            type=match,pattern=(.+),group=1
-            type=match,pattern=^(\d+),group=1
-          flavor: |
-            latest=true
-            suffix=-apache
-      - name: 'Build and push latest Apache container images'
-        uses: docker/build-push-action@v2
-        with:
-          context: 5.0/apache
-          push: true
-          tags: ${{ steps.metadata-apache.outputs.tags }}
-          labels: ${{ steps.metadata-apache.outputs.labels }}
-
-      - name: 'FPM variant metadata'
-        id: metadata-fpm
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            docker.io/martialblog/limesurvey
-          tags: |
-            type=match,pattern=(.+),group=1
-            type=match,pattern=^(\d+),group=1
-          flavor: |
-            latest=false
-            suffix=-fpm
-      - name: 'Build and push latest fpm container images'
-        uses: docker/build-push-action@v2
-        with:
-          context: 5.0/fpm
-          push: true
-          tags: ${{ steps.metadata-fpm.outputs.tags }}
-          labels: ${{ steps.metadata-fpm.outputs.labels }}
-
-      - name: 'FPM Alpine variant metadata'
-        id: metadata-fpm-alpine
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            docker.io/martialblog/limesurvey
-          tags: |
-            type=match,pattern=(.+),group=1
-            type=match,pattern=^(\d+),group=1
-          flavor: |
-            latest=false
-            suffix=-fpm-alpine
-      - name: 'Build and push latest fpm-alpine container images'
-        uses: docker/build-push-action@v2
-        with:
-          context: 5.0/fpm-alpine
-          push: true
-          tags: ${{ steps.metadata-fpm-alpine.outputs.tags }}
-          labels: ${{ steps.metadata-fpm-alpine.outputs.labels }}

.github/workflows/build-lts-container-images.yaml

@@ -1,103 +0,0 @@
-name: Publish LTS Container Images
-on:
-  push:
-    tags:
-      - '3.*'
-
-jobs:
-  lint_dockerfiles:
-    name: 'Lint Dockerfile with hadolint'
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dockerfile:
-          - 3.0/apache/Dockerfile
-          - 3.0/fpm-alpine/Dockerfile
-          - 3.0/fpm/Dockerfile
-    steps:
-      - uses: actions/checkout@v2
-      - uses: hadolint/hadolint-action@v1.5.0
-        with:
-          dockerfile: ${{ matrix.dockerfile }}
-          ignore: DL4006 DL3008 DL3018
-
-  push_images_to_registries:
-    name: 'Push container images to registries'
-    runs-on: ubuntu-latest
-    needs: [lint_dockerfiles]
-    environment: docker-build
-    permissions:
-      packages: write
-      contents: read
-    steps:
-      - name: 'Check out the repo'
-        uses: actions/checkout@v2
-      - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v1
-        with:
-          buildkitd-flags: --debug
-      - name: 'Log in to DockerHub'
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-      - name: 'Apache variant metadata'
-        id: metadata-apache
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            docker.io/martialblog/limesurvey
-          tags: |
-            type=match,pattern=(.+),group=1
-            type=match,pattern=^(\d+),group=1
-          flavor: |
-            latest=false
-            suffix=-apache
-      - name: 'Build and push LTS apache container images'
-        uses: docker/build-push-action@v2
-        with:
-          context: 3.0/apache
-          push: true
-          tags: ${{ steps.metadata-apache.outputs.tags }}
-          labels: ${{ steps.metadata-apache.outputs.labels }}
-
-      - name: 'FPM variant metadata'
-        id: metadata-fpm
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            docker.io/martialblog/limesurvey
-          tags: |
-            type=match,pattern=(.+),group=1
-            type=match,pattern=^(\d+),group=1
-          flavor: |
-            latest=false
-            suffix=-fpm
-      - name: 'Build and push LTS fpm container images'
-        uses: docker/build-push-action@v2
-        with:
-          context: 3.0/fpm
-          push: true
-          tags: ${{ steps.metadata-fpm.outputs.tags }}
-          labels: ${{ steps.metadata-apache.outputs.labels }}
-
-      - name: 'FPM Alpine variant metadata'
-        id: metadata-fpm-alpine
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            docker.io/martialblog/limesurvey
-          tags: |
-            type=match,pattern=(.+),group=1
-            type=match,pattern=^(\d+),group=1
-          flavor: |
-            latest=false
-            suffix=-fpm-alpine
-      - name: 'Build and push LTS fpm-alpine container images'
-        uses: docker/build-push-action@v2
-        with:
-          context: 3.0/fpm-alpine
-          push: true
-          tags: ${{ steps.metadata-fpm-alpine.outputs.tags }}
-          labels: ${{ steps.metadata-apache.outputs.labels }}

.github/workflows/lint-dockerfiles.yaml

@@ -1,24 +0,0 @@
----
-name: Lint Dockerfile
-
-on: [push, pull_request]
-
-jobs:
-  lint:
-    name: Lint Dockerfile with hadolint
-    strategy:
-      matrix:
-        dockerfile:
-          - 3.0/apache/Dockerfile
-          - 3.0/fpm-alpine/Dockerfile
-          - 3.0/fpm/Dockerfile
-          - 5.0/apache/Dockerfile
-          - 5.0/fpm-alpine/Dockerfile
-          - 5.0/fpm/Dockerfile
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: hadolint/hadolint-action@v1.5.0
-        with:
-          dockerfile: ${{ matrix.dockerfile }}
-          ignore: DL4006 DL3008 DL3018

.github/workflows/test-latest-container-images.yaml

@@ -1,34 +0,0 @@
-name: Test Latest Container Images
-
-on: [push, pull_request]
-
-jobs:
-  test_images:
-    name: Test Latest Container Images with Trivy
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        context:
-          - apache
-          - fpm-alpine
-          - fpm
-    steps:
-      - name: 'Check out the repo'
-        uses: actions/checkout@v2
-
-      - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v1
-
-      - name: 'Build Container images'
-        uses: docker/build-push-action@v2
-        with:
-          context: 5.0/${{ matrix.context }}
-          push: false
-          load: true
-          tags: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
-
-      - name: 'Run Structure tests'
-        uses: plexsystems/container-structure-test-action@v0.2.0
-        with:
-          image: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
-          config: tests/${{ matrix.context }}-tests.yaml

.github/workflows/test-lts-container-images.yaml

@@ -1,34 +0,0 @@
-name: Test LTS Container Images
-
-on: [push, pull_request]
-
-jobs:
-  test_images:
-    name: Test LTS Container Images with Trivy
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        context:
-          - apache
-          - fpm-alpine
-          - fpm
-    steps:
-      - name: 'Check out the repo'
-        uses: actions/checkout@v2
-
-      - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v1
-
-      - name: 'Build Container images'
-        uses: docker/build-push-action@v2
-        with:
-          context: 3.0/${{ matrix.context }}
-          push: false
-          load: true
-          tags: docker.io/martialblog/limesurvey:3-${{ matrix.context }}
-
-      - name: 'Run Structure tests'
-        uses: plexsystems/container-structure-test-action@v0.2.0
-        with:
-          image: docker.io/martialblog/limesurvey:3-${{ matrix.context }}
-          config: tests/${{ matrix.context }}-tests.yaml

.travis.yml

@@ -0,0 +1,13 @@
+sudo: required
+language: bash
+services:
+  - docker
+
+matrix:
+  include:
+    - env: TAG=martialblog/limesurvey-apache
+      script: cd 3.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
+    - env: TAG=martialblog/limesurvey-alpine
+      script: cd 3.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG

3.0/apache/Dockerfile

@@ -1,5 +1,7 @@
-FROM docker.io/php:8.0-apache
+FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
+ARG version='3.25.4+201215'
+ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -17,8 +19,6 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libzip-dev \
-        libtidy-dev \
-        libsodium-dev \
         netcat \
         \
         && apt-get -y autoclean; apt-get -y autoremove; \
@@ -30,7 +30,7 @@ RUN set -ex; \
 
 # 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 gd && \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         exif \
@@ -42,10 +42,10 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
-        sodium \
-        tidy \
         zip
 
+ENV LIMESURVEY_VERSION=$version
+
 # Apache configuration
 RUN a2enmod headers rewrite remoteip; \
         {\
@@ -59,25 +59,17 @@ RUN a2enmod headers rewrite remoteip; \
 # Use the default production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-ARG version="3.28.35+221025"
-ARG sha256_checksum="f34dd1196da0c098ebad28109deef54a47643451969cc4a839e284fa35c90e66"
-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 official GitHub repository
+RUN curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz
 
-# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        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/ && \
         rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R www-data:www-data /var/www/html /etc/apache2
+        chown -R www-data:www-data /var/www/html
 
-WORKDIR /var/www/html
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-COPY vhosts-access-log.conf /etc/apache2/conf-enabled/other-vhosts-access-log.conf
-USER $USER
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+COPY entrypoint.sh entrypoint.sh
+
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]

3.0/apache/entrypoint.sh

@@ -19,14 +19,10 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
-SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
-TABLE_SESSION=${TABLE_SESSION:-}
 
 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
@@ -37,14 +33,9 @@ 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/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"
+    until nc -z -v -w30 $DB_HOST $DB_PORT
     do
         echo "Info: Waiting for database connection..."
         sleep 5
@@ -67,7 +58,7 @@ else
         DB_CHARSET=${DB_CHARSET:-'utf8'}
     fi
 
-    if [ -n "$DB_SOCK" ]; then
+    if [ ! -z "$DB_SOCK" ]; then
         echo 'Info: Using unix socket'
         DB_CONNECT='unix_socket'
     else
@@ -89,17 +80,12 @@ return array(
       'username' => '$DB_USERNAME',
       'password' => '$DB_PASSWORD',
       'charset' => '$DB_CHARSET',
-      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
     ),
-    //'session' => array (
-    //   'class' => 'application.core.web.DbHttpSession',
-    //   'connectionID' => 'db',
-    //   'sessionTableName' => '{{sessions}}',
-    //),
     'urlManager' => array(
       'urlFormat' => '$URL_FORMAT',
       'rules' => array(),
-      'showScriptName' => $SHOW_SCRIPT_NAME,
+      'showScriptName' => true,
     ),
     'request' => array(
       'baseUrl' => '$BASE_URL',
@@ -116,25 +102,17 @@ EOF
 
 fi
 
-# Enable Table Sessions if required
-if [ -n "$TABLE_SESSION" ]; then
-    echo 'Info: Setting Table Session'
-    # Remove the comments in the config
-    sed -i "s/\/\///g" application/config/config.php
-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
+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"
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
 fi
 
 exec "$@"

3.0/apache/vhosts-access-log.conf

@@ -1,3 +0,0 @@
-SetEnvIF User-Agent "(?i)(check|health|probe)" dontlog
-ErrorLog ${APACHE_LOG_DIR}/error.log
-CustomLog ${APACHE_LOG_DIR}/access.log combined env=!dontlog

3.0/fpm-alpine/Dockerfile

@@ -1,5 +1,7 @@
-FROM docker.io/php:8.0-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
+ARG version='3.25.4+201215'
+ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -8,8 +10,6 @@ RUN set -ex; \
         libpng-dev \
         libzip-dev \
         libjpeg-turbo-dev \
-        tidyhtml-dev \
-        libsodium-dev \
         openldap-dev \
         oniguruma-dev \
         imap-dev \
@@ -18,7 +18,7 @@ RUN set -ex; \
 
 # Install PHP Plugins
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
+        docker-php-ext-configure gd && \
         docker-php-ext-configure imap --with-imap-ssl && \
         docker-php-ext-install \
         gd \
@@ -29,18 +29,12 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
-        sodium \
-        tidy \
         zip
 
-ARG version="3.28.35+221025"
-ARG sha256_checksum="f34dd1196da0c098ebad28109deef54a47643451969cc4a839e284fa35c90e66"
-ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
-ENV LIMESURVEY_VERSION=$version
+# 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 GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        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/ && \
@@ -54,7 +48,6 @@ RUN set -ex; \
 
 EXPOSE 9000
 
-WORKDIR /var/www/html
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]

3.0/fpm-alpine/entrypoint.sh

@@ -19,8 +19,6 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
-SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
-TABLE_SESSION=${TABLE_SESSION:-}
 
 DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
@@ -37,7 +35,7 @@ fi
 
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
-    until nc -z -v -w30 "$DB_HOST" "$DB_PORT"
+    until nc -z -v -w30 $DB_HOST $DB_PORT
     do
         echo "Info: Waiting for database connection..."
         sleep 5
@@ -60,7 +58,7 @@ else
         DB_CHARSET=${DB_CHARSET:-'utf8'}
     fi
 
-    if [ -n "$DB_SOCK" ]; then
+    if [ ! -z "$DB_SOCK" ]; then
         echo 'Info: Using unix socket'
         DB_CONNECT='unix_socket'
     else
@@ -82,17 +80,12 @@ return array(
       'username' => '$DB_USERNAME',
       'password' => '$DB_PASSWORD',
       'charset' => '$DB_CHARSET',
-      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
     ),
-    //'session' => array (
-    //   'class' => 'application.core.web.DbHttpSession',
-    //   'connectionID' => 'db',
-    //   'sessionTableName' => '{{sessions}}',
-    //),
     'urlManager' => array(
       'urlFormat' => '$URL_FORMAT',
       'rules' => array(),
-      'showScriptName' => $SHOW_SCRIPT_NAME,
+      'showScriptName' => true,
     ),
     'request' => array(
       'baseUrl' => '$BASE_URL',
@@ -109,25 +102,17 @@ EOF
 
 fi
 
-# Enable Table Sessions if required
-if [ -n "$TABLE_SESSION" ]; then
-    echo 'Info: Setting Table Session'
-    # Remove the comments in the config
-    sed -i "s/\/\///g" application/config/config.php
-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
+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"
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
 fi
 
 exec "$@"

3.0/fpm/Dockerfile

@@ -1,5 +1,7 @@
-FROM docker.io/php:8.0-fpm
+FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
+ARG version='3.25.4+201215'
+ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -17,8 +19,6 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libzip-dev \
-        libtidy-dev \
-        libsodium-dev \
         netcat \
         \
         && apt-get -y autoclean; apt-get -y autoremove; \
@@ -30,7 +30,7 @@ RUN set -ex; \
 
 # 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 gd && \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         exif \
@@ -42,18 +42,14 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
-        sodium \
-        tidy \
         zip
 
-ARG version="3.28.35+221025"
-ARG sha256_checksum="f34dd1196da0c098ebad28109deef54a47643451969cc4a839e284fa35c90e66"
-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) 
+# 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 "${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/ && \
@@ -62,7 +58,6 @@ RUN set -ex; \
 
 EXPOSE 9000
 
-WORKDIR /var/www/html
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]

3.0/fpm/entrypoint.sh

@@ -19,8 +19,6 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
-SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
-TABLE_SESSION=${TABLE_SESSION:-}
 
 DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
@@ -37,7 +35,7 @@ fi
 
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
-    until nc -z -v -w30 "$DB_HOST" "$DB_PORT"
+    until nc -z -v -w30 $DB_HOST $DB_PORT
     do
         echo "Info: Waiting for database connection..."
         sleep 5
@@ -60,7 +58,7 @@ else
         DB_CHARSET=${DB_CHARSET:-'utf8'}
     fi
 
-    if [ -n "$DB_SOCK" ]; then
+    if [ ! -z "$DB_SOCK" ]; then
         echo 'Info: Using unix socket'
         DB_CONNECT='unix_socket'
     else
@@ -82,17 +80,12 @@ return array(
       'username' => '$DB_USERNAME',
       'password' => '$DB_PASSWORD',
       'charset' => '$DB_CHARSET',
-      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
     ),
-    //'session' => array (
-    //   'class' => 'application.core.web.DbHttpSession',
-    //   'connectionID' => 'db',
-    //   'sessionTableName' => '{{sessions}}',
-    //),
     'urlManager' => array(
       'urlFormat' => '$URL_FORMAT',
       'rules' => array(),
-      'showScriptName' => $SHOW_SCRIPT_NAME,
+      'showScriptName' => true,
     ),
     'request' => array(
       'baseUrl' => '$BASE_URL',
@@ -109,25 +102,17 @@ EOF
 
 fi
 
-# Enable Table Sessions if required
-if [ -n "$TABLE_SESSION" ]; then
-    echo 'Info: Setting Table Session'
-    # Remove the comments in the config
-    sed -i "s/\/\///g" application/config/config.php
-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
+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"
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
 fi
 
 exec "$@"

4.0/apache/Dockerfile

@@ -1,5 +1,7 @@
-FROM docker.io/php:8.0-apache
+FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
+ARG version='4.3.31+201214'
+ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -17,8 +19,6 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libzip-dev \
-        libtidy-dev \
-        libsodium-dev \
         netcat \
         curl \
         \
@@ -31,7 +31,7 @@ RUN set -ex; \
 
 # 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 gd && \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         exif \
@@ -43,10 +43,10 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
-        sodium \
-        tidy \
         zip
 
+ENV LIMESURVEY_VERSION=$version
+
 # Apache configuration
 RUN a2enmod headers rewrite remoteip; \
         {\
@@ -60,27 +60,17 @@ RUN a2enmod headers rewrite remoteip; \
 # Use the default production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-ARG version="5.4.8+221024"
-ARG sha256_checksum="8445c4f14dee4b16513a19d7e5298e86da885d02823b58ded9905496f558132c"
-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 official GitHub repository
+RUN curl -sSL "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" --output /tmp/limesurvey.tar.gz
 
-# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        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/ && \
         rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R "$USER:$USER" /var/www/html /etc/apache2
+        chown -R www-data:www-data /var/www/html
 
-EXPOSE $LISTEN_PORT
+COPY entrypoint.sh entrypoint.sh
 
-WORKDIR /var/www/html
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-COPY vhosts-access-log.conf /etc/apache2/conf-enabled/other-vhosts-access-log.conf
-USER $USER
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]

4.0/apache/entrypoint.sh

@@ -10,13 +10,10 @@ 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:-}
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
@@ -26,8 +23,6 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
-SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
-TABLE_SESSION=${TABLE_SESSION:-}
 
 DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
@@ -44,7 +39,7 @@ fi
 
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
-    until nc -z -v -w30 "$DB_HOST" "$DB_PORT"
+    until nc -z -v -w30 $DB_HOST $DB_PORT
     do
         echo "Info: Waiting for database connection..."
         sleep 5
@@ -67,7 +62,7 @@ else
         DB_CHARSET=${DB_CHARSET:-'utf8'}
     fi
 
-    if [ -n "$DB_SOCK" ]; then
+    if [ ! -z "$DB_SOCK" ]; then
         echo 'Info: Using unix socket'
         DB_CONNECT='unix_socket'
     else
@@ -89,17 +84,12 @@ return array(
       'username' => '$DB_USERNAME',
       'password' => '$DB_PASSWORD',
       'charset' => '$DB_CHARSET',
-      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
     ),
-    //'session' => array (
-    //   'class' => 'application.core.web.DbHttpSession',
-    //   'connectionID' => 'db',
-    //   'sessionTableName' => '{{sessions}}',
-    //),
     'urlManager' => array(
       'urlFormat' => '$URL_FORMAT',
       'rules' => array(),
-      'showScriptName' => $SHOW_SCRIPT_NAME,
+      'showScriptName' => true,
     ),
     'request' => array(
       'baseUrl' => '$BASE_URL',
@@ -109,7 +99,6 @@ return array(
     'publicurl'=>'$PUBLIC_URL',
     'debug'=>$DEBUG,
     'debugsql'=>$DEBUG_SQL,
-    'mysqlEngine' => '$DB_MYSQL_ENGINE',
   )
 );
 
@@ -117,19 +106,12 @@ EOF
 
 fi
 
-# Enable Table Sessions if required
-if [ -n "$TABLE_SESSION" ]; then
-    echo 'Info: Setting Table Session'
-    # Remove the comments in the config
-    sed -i "s/\/\///g" application/config/config.php
-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
+    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
@@ -137,8 +119,6 @@ else
 \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
 \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
 \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
-\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
 return \$config;
 EOF
     else
@@ -152,14 +132,12 @@ fi
 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
+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"
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
 fi
 
 exec "$@"

4.0/fpm-alpine/Dockerfile

@@ -1,5 +1,7 @@
-FROM docker.io/php:8.0-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
+ARG version='4.3.31+201214'
+ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -8,8 +10,6 @@ RUN set -ex; \
         libpng-dev \
         libzip-dev \
         libjpeg-turbo-dev \
-        tidyhtml-dev \
-        libsodium-dev \
         openldap-dev \
         oniguruma-dev \
         imap-dev \
@@ -18,7 +18,7 @@ RUN set -ex; \
 
 # Install PHP Plugins
 RUN set -ex; \
-        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
+        docker-php-ext-configure gd && \
         docker-php-ext-configure imap --with-imap-ssl && \
         docker-php-ext-install \
         exif \
@@ -30,19 +30,12 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
-        sodium \
-        tidy \
         zip
 
-ARG version="5.4.8+221024"
-ARG sha256_checksum="8445c4f14dee4b16513a19d7e5298e86da885d02823b58ded9905496f558132c"
-ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
-ARG USER=www-data
-ENV LIMESURVEY_VERSION=$version
+# 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 GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
 RUN set -ex; \
-        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/ && \
@@ -51,13 +44,11 @@ RUN set -ex; \
         /var/www/html/docs \
         /var/www/html/tests \
         /var/www/html/*.md && \
-        chown -R "${USER}:root" /var/www/ ; \
+        chown -R www-data:root /var/www/ ; \
         chmod -R g=u /var/www
 
 EXPOSE 9000
 
-WORKDIR /var/www/html
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-USER $USER
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]

4.0/fpm-alpine/entrypoint.sh

@@ -10,13 +10,10 @@ 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:-}
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
@@ -26,8 +23,6 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
-SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
-TABLE_SESSION=${TABLE_SESSION:-}
 
 DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
@@ -44,7 +39,7 @@ fi
 
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
-    until nc -z -v -w30 "$DB_HOST" "$DB_PORT"
+    until nc -z -v -w30 $DB_HOST $DB_PORT
     do
         echo "Info: Waiting for database connection..."
         sleep 5
@@ -67,7 +62,7 @@ else
         DB_CHARSET=${DB_CHARSET:-'utf8'}
     fi
 
-    if [ -n "$DB_SOCK" ]; then
+    if [ ! -z "$DB_SOCK" ]; then
         echo 'Info: Using unix socket'
         DB_CONNECT='unix_socket'
     else
@@ -89,17 +84,12 @@ return array(
       'username' => '$DB_USERNAME',
       'password' => '$DB_PASSWORD',
       'charset' => '$DB_CHARSET',
-      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
     ),
-    //'session' => array (
-    //   'class' => 'application.core.web.DbHttpSession',
-    //   'connectionID' => 'db',
-    //   'sessionTableName' => '{{sessions}}',
-    //),
     'urlManager' => array(
       'urlFormat' => '$URL_FORMAT',
       'rules' => array(),
-      'showScriptName' => $SHOW_SCRIPT_NAME,
+      'showScriptName' => true,
     ),
     'request' => array(
       'baseUrl' => '$BASE_URL',
@@ -109,7 +99,6 @@ return array(
     'publicurl'=>'$PUBLIC_URL',
     'debug'=>$DEBUG,
     'debugsql'=>$DEBUG_SQL,
-    'mysqlEngine' => '$DB_MYSQL_ENGINE',
   )
 );
 
@@ -117,19 +106,12 @@ EOF
 
 fi
 
-# Enable Table Sessions if required
-if [ -n "$TABLE_SESSION" ]; then
-    echo 'Info: Setting Table Session'
-    # Remove the comments in the config
-    sed -i "s/\/\///g" application/config/config.php
-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
+    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
@@ -137,8 +119,6 @@ else
 \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
 \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
 \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
-\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
 return \$config;
 EOF
     else
@@ -152,14 +132,12 @@ fi
 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
+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"
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
 fi
 
 exec "$@"

4.0/fpm/Dockerfile

@@ -1,5 +1,7 @@
-FROM docker.io/php:8.0-fpm
+FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
+ARG version='4.3.31+201214'
+ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -17,8 +19,6 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libzip-dev \
-        libtidy-dev \
-        libsodium-dev \
         netcat \
         \
         && apt-get -y autoclean; apt-get -y autoremove; \
@@ -30,7 +30,7 @@ RUN set -ex; \
 
 # 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 gd && \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         exif \
@@ -42,29 +42,22 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         pgsql \
-        sodium \
-        tidy \
         zip
 
-ARG version="5.4.8+221024"
-ARG sha256_checksum="8445c4f14dee4b16513a19d7e5298e86da885d02823b58ded9905496f558132c"
-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) 
+# 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 "${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/ && \
         rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R "$USER:$USER" /var/www/html
+        chown -R www-data:www-data /var/www/html
 
 EXPOSE 9000
 
-WORKDIR /var/www/html
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-USER $USER
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]

4.0/fpm/entrypoint.sh

@@ -10,13 +10,10 @@ 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:-}
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
@@ -26,14 +23,10 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
 URL_FORMAT=${URL_FORMAT:-'path'}
-SHOW_SCRIPT_NAME=${SHOW_SCRIPT_NAME:-'true'}
-TABLE_SESSION=${TABLE_SESSION:-}
 
 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
@@ -44,14 +37,9 @@ 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/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"
+    until nc -z -v -w30 $DB_HOST $DB_PORT
     do
         echo "Info: Waiting for database connection..."
         sleep 5
@@ -74,7 +62,7 @@ else
         DB_CHARSET=${DB_CHARSET:-'utf8'}
     fi
 
-    if [ -n "$DB_SOCK" ]; then
+    if [ ! -z "$DB_SOCK" ]; then
         echo 'Info: Using unix socket'
         DB_CONNECT='unix_socket'
     else
@@ -96,17 +84,12 @@ return array(
       'username' => '$DB_USERNAME',
       'password' => '$DB_PASSWORD',
       'charset' => '$DB_CHARSET',
-      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
+      'tablePrefix' => '$DB_TABLE_PREFIX',
     ),
-    //'session' => array (
-    //   'class' => 'application.core.web.DbHttpSession',
-    //   'connectionID' => 'db',
-    //   'sessionTableName' => '{{sessions}}',
-    //),
     'urlManager' => array(
       'urlFormat' => '$URL_FORMAT',
       'rules' => array(),
-      'showScriptName' => $SHOW_SCRIPT_NAME,
+      'showScriptName' => true,
     ),
     'request' => array(
       'baseUrl' => '$BASE_URL',
@@ -116,7 +99,6 @@ return array(
     'publicurl'=>'$PUBLIC_URL',
     'debug'=>$DEBUG,
     'debugsql'=>$DEBUG_SQL,
-    'mysqlEngine' => '$DB_MYSQL_ENGINE',
   )
 );
 
@@ -124,19 +106,12 @@ EOF
 
 fi
 
-# Enable Table Sessions if required
-if [ -n "$TABLE_SESSION" ]; then
-    echo 'Info: Setting Table Session'
-    # Remove the comments in the config
-    sed -i "s/\/\///g" application/config/config.php
-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
+    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
@@ -144,8 +119,6 @@ else
 \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
 \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
 \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
-\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
 return \$config;
 EOF
     else
@@ -159,14 +132,12 @@ fi
 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
+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"
+    php application/commands/console.php install $ADMIN_USER $ADMIN_PASSWORD $ADMIN_NAME $ADMIN_EMAIL
 fi
 
 exec "$@"

5.0/apache/vhosts-access-log.conf

@@ -1,3 +0,0 @@
-SetEnvIF User-Agent "(?i)(check|health|probe)" dontlog
-ErrorLog ${APACHE_LOG_DIR}/error.log
-CustomLog ${APACHE_LOG_DIR}/access.log combined env=!dontlog

CONTRIBUTING.md

@@ -2,15 +2,6 @@
 
 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)
@@ -21,41 +12,27 @@ 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 5.0/apache/Dockerfile
-ARG version='5.3.13+200824'
+$ grep ARG 4.0/apache/Dockerfile
+ARG version='4.3.13+200824'
 ARG sha256_checksum='4e9c6f20e'
 ```
 
 It is best to use the upgrade shell script:
 
 ```bash
-./upgrade.sh 5.3.13+200824
+./upgrade.sh 4.3.13+200824
 # Check if sha256 is correct
 
-git add 5.0/ && git commit -m 'Upgrading to Version 5.3.13+200824'
-git tag 5.3.13-200824
+git add 4.0/ && git commit -m 'Upgrading to Version 4.3.13+200824'
+git tag 4.3.13+200824
 ```
 
 ## Testing
 
-In order to make sure the image works as promised, some container-structure-tests are provided. The tests require the `container-structure-test` tool to be installed.
+In order to make sure the image works as promised, some tests are provided:
+
+```bash
+./tests/run.sh
+```
 
 For further information:  https://github.com/GoogleContainerTools/container-structure-test
-
-```bash
-make apache-latest
-
-container-structure-test test --image docker.io/martialblog/limesurvey:5-apache --config tests/apache-tests.yaml
-```
-
-```bash
-make fpm-latest
-
-container-structure-test test --image  docker.io/martialblog/limesurvey:5-fpm-alpine --config tests/fpm-alpine-tests.yaml
-```
-
-```bash
-make fpm-alpine-latest
-
-container-structure-test test --image  docker.io/martialblog/limesurvey:5-fpm --config tests/fpm-tests.yaml
-```

Makefile

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

README.md

@@ -1,6 +1,4 @@
-[![Lint Dockerfile](https://github.com/martialblog/docker-limesurvey/actions/workflows/lint-dockerfiles.yaml/badge.svg)](https://github.com/martialblog/docker-limesurvey/actions/workflows/lint-dockerfiles.yaml)
-[![Test LTS Container Images](https://github.com/martialblog/docker-limesurvey/actions/workflows/test-lts-container-images.yaml/badge.svg)](https://github.com/martialblog/docker-limesurvey/actions/workflows/test-lts-container-images.yaml)
-[![Test Latest Container Images](https://github.com/martialblog/docker-limesurvey/actions/workflows/test-latest-container-images.yaml/badge.svg)](https://github.com/martialblog/docker-limesurvey/actions/workflows/test-latest-container-images.yaml)
+[![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
@@ -14,18 +12,16 @@ Dockerfile to build a [LimeSurvey](https://limesurvey.org) Image for the Docker
 
 ## 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)
+- [`4-apache`, `4.<BUILD-NUMBER>-apache`, `latest` ](https://github.com/martialblog/docker-limesurvey/blob/master/4.0/apache/Dockerfile)
+- [`4-fpm`, `4.<BUILD-NUMBER>-fpm`](https://github.com/martialblog/docker-limesurvey/blob/master/4.0/fpm/Dockerfile)
+- [`4-fpm-alpine`, `4.<BUILD-NUMBER>-fpm-alpine`](https://github.com/martialblog/docker-limesurvey/blob/master/4.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.
+The apache image comes with an Apache Webserver and PHP installed.
 
 ## Apache Configuration
 
@@ -35,8 +31,6 @@ To change to Apache Webserver configuration, mount a Volume into the Container a
 
 See the example configuration provided.
 
-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.
@@ -75,7 +69,7 @@ To change to LimeSurvey configuration, you can mount a Volume into the Container
 
 ## Data encryption
 
-LimeSurvey version 4.0 and newer support data encryption, this image give you these options:
+LimeSurvey 4 supports 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)
@@ -87,8 +81,6 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 
 ## Traefik example
 
-**Hint**: if you want to deploy LimeSurvey on a sub-path (e.g. https://example.com/limesurvey) you have to set the BASE_URL and adjust the Containers Webservers. See the docker-compose Traefik example in the repository.
-
 ```
 # BASE_URL = /limesurvey
 "traefik.http.routers.limesurvey.rule=PathPrefix(`/limesurvey`)",
@@ -105,8 +97,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 | DB_PORT         | Database server port                      |
 | DB_SOCK         | Database unix socket instead of host/port |
 | DB_NAME         | Database name                             |
-| DB_TABLE_PREFIX | Database table prefix; set this to a single whitespace if you don't want a table prefix. |
-| DB_MYSQL_ENGINE | MySQL engine used for survey tables (values: MyISAM, InnoDB, default: MyISAM)       |
+| DB_TABLE_PREFIX | Database table prefix                     |
 | DB_USERNAME     | Database user                             |
 | DB_PASSWORD     | Database user's password                  |
 | ADMIN_USER      | Initial LimeSurvey Admin User             |
@@ -116,20 +107,15 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 | PUBLIC_URL      | Public URL for public scripts             |
 | 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 |
 | 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             |
 | ENCRYPT_SECRET_KEY | Data encryption secret key             |
-| ENCRYPT_NONCE      | Data encryption nonce (used in 5.0)    |
-| ENCRYPT_SECRET_BOX_KEY | Data encryption secret box key (used in 5.0)             |
-| LISTEN_PORT     | Apache: Listen port. Default: 8080        |
 
 For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
 
-# Running LimeSurvey 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).
 
@@ -143,48 +129,6 @@ http://localhost:8080/
 http://localhost:8080/index.php/admin
 ```
 
-# Running LimeSurvey with Helm
-
-A Helm Chart for this Image can be used for deployments. Please refer to the Helm Repository for further details:
-
-https://github.com/martialblog/helm-charts
-
-# 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

@@ -1,7 +1,7 @@
 version: '3'
 services:
   limesurvey:
-    image: docker.io/martialblog/limesurvey:latest
+    image: martialblog/limesurvey:latest
     restart: always
     environment:
       - DB_TYPE=pgsql
@@ -18,14 +18,12 @@ services:
     volumes:
       - limesurvey:/var/www/html/upload/surveys
     ports:
-      - 8080:8080
+      - 8080:80
     depends_on:
       - db
   db:
-    image: docker.io/postgres:10-alpine
+    image: postgres:9.6-alpine
     restart: always
-    volumes:
-      - db-data:/var/lib/postgresql
     environment:
       - POSTGRES_USER=limesurvey
       - POSTGRES_DB=limesurvey
@@ -33,4 +31,3 @@ services:
 
 volumes:
   limesurvey:
-  db-data:

docker-compose.fpm-certbot.yml

@@ -2,10 +2,9 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 5.0/fpm/
+      context: 4.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:
@@ -33,14 +32,14 @@ services:
     environment:
       - "HOSTNAMES=www.example.com example.com"
   certbot:
-    image: docker.io/certbot/certbot
+    image: 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: docker.io/mysql:5.7
+    image: mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"

docker-compose.fpm.alpine.yml

@@ -2,10 +2,9 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 5.0/fpm-alpine/
+      context: 4.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:
@@ -17,18 +16,16 @@ services:
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-web:
-    image: docker.io/nginx:alpine
+    image: nginx:alpine
     links:
       - limesurvey
-    depends_on:
-      - limesurvey
     ports:
       - "8080:80"
     volumes:
       - ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
       - lime:/var/www/html
   lime-db:
-    image: docker.io/mysql:5.7
+    image: mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"

docker-compose.fpm.yml

@@ -2,10 +2,9 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 5.0/fpm/
+      context: 4.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:
@@ -17,7 +16,7 @@ services:
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-web:
-    image: docker.io/nginx
+    image: nginx
     links:
       - limesurvey
     ports:
@@ -26,7 +25,7 @@ services:
       - ./examples/nginx.conf:/etc/nginx/nginx.conf:ro
       - lime:/var/www/html
   lime-db:
-    image: docker.io/mysql:5.7
+    image: mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"

docker-compose.pgsql.yml

@@ -2,19 +2,16 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      # Hint: Change it to 3.0/apache/ if you want to use LimeSurvey 3.*
-      context: 5.0/apache/
+      context: 4.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:
-      # Hint: Change it to 80:8080 if you are using LimeSurvey 3.*
-      - "8080:8080"
+      - "8080:80"
     environment:
       - "DB_TYPE=pgsql"
       - "DB_PORT=5432"
@@ -22,13 +19,8 @@ services:
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
   lime-db:
-    image: docker.io/postgres:10
-    volumes:
-      - db-data:/var/lib/postgresql/data
+    image: postgres:10
     environment:
       - "POSTGRES_USER=limesurvey"
       - "POSTGRES_DB=limesurvey"
       - "POSTGRES_PASSWORD=secret"
-
-volumes:
-  db-data:

docker-compose.traefik.yml

@@ -1,46 +0,0 @@
-version: "3.0"
-services:
-  limesurvey:
-    build:
-      context: 5.0/apache/
-      dockerfile: Dockerfile
-    labels:
-      traefik.enable: 'true'
-      traefik.http.routers.limesurvey-http-router.entrypoints: "http"
-      traefik.http.routers.limesurvey-http-router.rule: "PathPrefix(`/limesurvey`)"
-      traefik.http.services.limesurvey-service.loadbalancer.server.port: "8080"
-    links:
-      - lime-db
-    depends_on:
-      - lime-db
-    volumes:
-      # Unfortunately the StripPrefix Function in Traefik won't work;
-      # Meaning, we will have to set 'Alias /limesurvey "/var/www/html"' in the Apache Config
-      - "./examples/apache-example.conf:/etc/apache2/sites-available/000-default.conf:ro"
-    environment:
-      - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
-      - "ADMIN_PASSWORD=foobar"
-      - "PUBLIC_URL=http://localhost:8888/limesurvey"
-      - "BASE_URL=http://localhost:8888/limesurvey"
-  traefik:
-    image: docker.io/traefik:v2.5
-    container_name: "traefik"
-    command:
-      - "--api.insecure=true"
-      - "--providers.docker=true"
-      - "--providers.docker.exposedbydefault=false"
-      - "--entrypoints.http.address=:8888"
-    ports:
-      - "8888:8888"
-      - "8080:8080"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-  lime-db:
-    image: docker.io/mysql:5.7
-    environment:
-      - "MYSQL_USER=limesurvey"
-      - "MYSQL_DATABASE=limesurvey"
-      - "MYSQL_PASSWORD=secret"
-      - "MYSQL_ROOT_PASSWORD=secret"
-

docker-compose.yml

@@ -2,25 +2,22 @@ version: "3.0"
 services:
   limesurvey:
     build:
-      context: 5.0/apache/
+      context: 4.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:8080"
+      - "8080:80"
     environment:
       - "DB_HOST=lime-db"
       - "DB_PASSWORD=secret"
       - "ADMIN_PASSWORD=foobar"
-      # If you require an empty table prefix, use a space as the DB_TABLE_PREFIX
-      # - "DB_TABLE_PREFIX= "
   lime-db:
-    image: docker.io/mysql:5.7
+    image: mysql:5.7
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"

examples/apache-example.conf

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

examples/nginx.conf

@@ -19,7 +19,7 @@ http {
         location / {
             try_files $uri /index.php?$args;
         }
-        location ~ ^/(protected|application|framework|themes/\w+/views) {
+        location ~ ^/(protected|framework|themes/\w+/views) {
             deny  all;
         }
         location ~ \.(js|css|png|jpg|gif|swf|ico|pdf|mov|fla|zip|rar)$ {

makefile

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

nginx-certbot/Dockerfile

@@ -1,14 +1,10 @@
-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/*
+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/*
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod 700 /entrypoint.sh
+
 CMD ["/entrypoint.sh"]

nginx-certbot/entrypoint.sh

@@ -1,25 +1,25 @@
 #!/bin/sh
 
-cert_path=/etc/letsencrypt/live/$(echo "$HOSTNAMES" | awk '{print $1}')
-mkdir -p $cert_path
+cert_path=/etc/letsencrypt/live/$(echo $HOSTNAMES | awk '{print $1}')
+mkdir -p cert_path
 
 # if there is no certificate yet, get one
 email="--email $CERT_EMAIL"
-if [ -z "$CERT_EMAIL" ]
+if [ -z $CERT_EMAIL ]
 then
     email='--register-unsafely-without-email'
 fi
-if [ ! -e "$cert_path/privkey.pem" ]
+if [ ! -e $cert_path/privkey.pem ]
 then
     names=""
     for h in $HOSTNAMES
     do
-        names="$names -d $h"
+        names=$(echo "$names -d $h")
     done
     echo "Getting new certificate..."
     /usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > /etc/letsencrypt/options-ssl-nginx.conf
     /usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > /etc/letsencrypt/ssl-dhparams.pem
-    /usr/bin/certbot certonly --standalone $names --agree-tos "$email"
+    /usr/bin/certbot certonly --standalone $names --agree-tos $email
 fi
 
-nginx -g "daemon off;"
+nginx -g "daemon off;"

tests/fpm-alpine-tests.yaml

@@ -1,57 +0,0 @@
-schemaVersion: "2.0.0"
-
-globalEnvVars:
-  - key: "PATH"
-    value: "/env/bin:$PATH"
-
-fileContentTests:
-  - name: 'Limesurvey admin file content'
-    path: '/var/www/html/admin/index.php'
-    expectedContents: ['LimeSurvey']
-  - name: 'Entrypoint file content'
-    path: '/usr/local/bin/entrypoint.sh'
-    expectedContents: ['console.php', 'ADMIN_USER']
-
-fileExistenceTests:
-  - name: 'Limesurvey files'
-    path: '/var/www/html/index.php'
-    shouldExist: true
-    permissions: '-rw-rw-r--'
-  - name: 'Limesurvey admin files'
-    path: '/var/www/html/admin/index.php'
-    shouldExist: true
-    permissions: '-rw-rw-r--'
-  - name:  "Dependencies - PHP - gd"
-    path: '/usr/local/etc/php/conf.d/docker-php-ext-gd.ini'
-    shouldExist: true
-  - name:  "Dependencies - PHP - imap"
-    path: '/usr/local/etc/php/conf.d/docker-php-ext-imap.ini'
-    shouldExist: true
-  - name:  "Dependencies - PHP - ldap"
-    path: '/usr/local/etc/php/conf.d/docker-php-ext-ldap.ini'
-    shouldExist: true
-  - name:  "Dependencies - PHP - pgsql"
-    path: '/usr/local/etc/php/conf.d/docker-php-ext-pgsql.ini'
-    shouldExist: true
-  - name:  "Dependencies - PHP - zip"
-    path: '/usr/local/etc/php/conf.d/docker-php-ext-zip.ini'
-    shouldExist: true
-  - name:  "Dependencies - PHP - sodium"
-    path: '/usr/local/etc/php/conf.d/docker-php-ext-sodium.ini'
-    shouldExist: true
-  - name:  "Dependencies - PHP - pdo_mysql"
-    path: '/usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini'
-    shouldExist: true
-  - name:  "Dependencies - PHP - pdo_pgsql"
-    path: '/usr/local/etc/php/conf.d/docker-php-ext-pdo_pgsql.ini'
-    shouldExist: true
-
-commandTests:
-  - name:  "Dependencies - netcat"
-    command: "apk"
-    args: ["info", "-e", "netcat-openbsd"]
-    exitCode: 0
-  - name:  "Dependencies - PHP Modules"
-    command: "php"
-    args: ["-m"]
-    expectedOutput: ["ldap", "zip", "pdo_mysql", "pdo_sqlite", "gd", "mbstring", "PDO", "imap"]

tests/fpm-tests.yaml

@@ -1 +0,0 @@
-apache-tests.yaml

tests/image_tests.yaml

@@ -9,7 +9,7 @@ fileContentTests:
     path: '/var/www/html/admin/index.php'
     expectedContents: ['LimeSurvey']
   - name: 'Entrypoint file content'
-    path: '/usr/local/bin/entrypoint.sh'
+    path: '/var/www/html/entrypoint.sh'
     expectedContents: ['console.php', 'ADMIN_USER']
 
 fileExistenceTests:

tests/run.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+IMAGE=$1
+
+if [ ! -f container-structure-test ]; then
+   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
+
+./container-structure-test test --image $IMAGE --config tests/image_tests.yaml

upgrade.sh

@@ -11,14 +11,11 @@ if [ $# -eq 0 ]
 fi
 
 NEW_VERSION=$1
-MAJOR_VERSION="${NEW_VERSION%%.*}.0"
-NEW_TAG="${NEW_VERSION%+*}-${NEW_VERSION#*+}"
+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"
+grep -qc $NEW_VERSION $MAJOR_VERSION/apache/Dockerfile $MAJOR_VERSION/fpm/Dockerfile $MAJOR_VERSION/fpm-alpine/Dockerfile
 
-GREP_NEW_VERSION_EXIT_CODE=$?
-
-if [ $GREP_NEW_VERSION_EXIT_CODE -eq 0 ]
+if [ $? -eq 0 ]
    then
        echo "Already at version ${NEW_VERSION}"
        exit 0
@@ -30,9 +27,9 @@ wget -P /tmp "https://github.com/LimeSurvey/LimeSurvey/archive/${NEW_VERSION}.ta
 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"
+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
-echo "git add 3.0 ; git commit -m 'Upgrading to LTS Version ${NEW_VERSION}' && git tag ${NEW_TAG}"
-echo "git add 5.0 ; git commit -m 'Upgrading to Version ${NEW_VERSION}' && git tag ${NEW_TAG}"
+echo "git add 3.0 ; git commit -m 'Upgrading to LTS Version ${NEW_VERSION}' && git tag ${NEW_VERSION}"
+echo "git add 4.0 ; git commit -m 'Upgrading to Version ${NEW_VERSION}' && git tag ${NEW_VERSION}"