Upgrading to Version 6.4.5+240205

Upgrade to 5.6.46+231121 and 6.3.6+231120

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

@@ -15,7 +15,7 @@ jobs:
           - 6.0/fpm-alpine/Dockerfile
           - 6.0/fpm/Dockerfile
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: hadolint/hadolint-action@v3.1.0
         with:
           dockerfile: ${{ matrix.dockerfile }}
@@ -31,24 +31,24 @@ jobs:
       contents: read
     steps:
       - name: 'Check out the repo'
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: 'Set up QEMU'
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: 'arm64,arm'
       - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           buildkitd-flags: --debug
       - name: 'Log in to DockerHub'
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - name: 'Apache variant metadata'
         id: metadata-apache
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             docker.io/martialblog/limesurvey
@@ -59,7 +59,7 @@ jobs:
             latest=true
             suffix=-apache
       - name: 'Build and push latest Apache container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 6.0/apache
           push: true
@@ -69,7 +69,7 @@ jobs:
 
       - name: 'FPM variant metadata'
         id: metadata-fpm
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             docker.io/martialblog/limesurvey
@@ -80,7 +80,7 @@ jobs:
             latest=false
             suffix=-fpm
       - name: 'Build and push latest fpm container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 6.0/fpm
           push: true
@@ -90,7 +90,7 @@ jobs:
 
       - name: 'FPM Alpine variant metadata'
         id: metadata-fpm-alpine
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             docker.io/martialblog/limesurvey
@@ -101,7 +101,7 @@ jobs:
             latest=false
             suffix=-fpm-alpine
       - name: 'Build and push latest fpm-alpine container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 6.0/fpm-alpine
           push: true

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

@@ -15,7 +15,7 @@ jobs:
           - 5.0/fpm-alpine/Dockerfile
           - 5.0/fpm/Dockerfile
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: hadolint/hadolint-action@v3.1.0
         with:
           dockerfile: ${{ matrix.dockerfile }}
@@ -31,24 +31,24 @@ jobs:
       contents: read
     steps:
       - name: 'Check out the repo'
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: 'Set up QEMU'
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: 'arm64,arm'
       - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           buildkitd-flags: --debug
       - name: 'Log in to DockerHub'
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - name: 'Apache variant metadata'
         id: metadata-apache
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             docker.io/martialblog/limesurvey
@@ -59,7 +59,7 @@ jobs:
             latest=false
             suffix=-apache
       - name: 'Build and push LTS apache container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 5.0/apache
           push: true
@@ -69,7 +69,7 @@ jobs:
 
       - name: 'FPM variant metadata'
         id: metadata-fpm
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             docker.io/martialblog/limesurvey
@@ -80,7 +80,7 @@ jobs:
             latest=false
             suffix=-fpm
       - name: 'Build and push LTS fpm container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 5.0/fpm
           push: true
@@ -90,7 +90,7 @@ jobs:
 
       - name: 'FPM Alpine variant metadata'
         id: metadata-fpm-alpine
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             docker.io/martialblog/limesurvey
@@ -101,7 +101,7 @@ jobs:
             latest=false
             suffix=-fpm-alpine
       - name: 'Build and push LTS fpm-alpine container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 5.0/fpm-alpine
           push: true

.github/workflows/lint-dockerfiles.yaml

@@ -17,7 +17,7 @@ jobs:
           - 6.0/fpm/Dockerfile
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: hadolint/hadolint-action@v3.1.0
         with:
           dockerfile: ${{ matrix.dockerfile }}

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

@@ -22,18 +22,18 @@ jobs:
           - linux/arm64
     steps:
       - name: 'Check out the repo'
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: 'Set up QEMU'
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: 'arm64,arm'
 
       - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: 'Build Container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 6.0/${{ matrix.context }}
           push: false

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

@@ -14,18 +14,18 @@ jobs:
           - fpm
     steps:
       - name: 'Check out the repo'
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: 'Set up QEMU'
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: 'arm64,arm'
 
       - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: 'Build Container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 6.0/${{ matrix.context }}
           push: false

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

@@ -14,16 +14,16 @@ jobs:
           - fpm
     steps:
       - name: 'Check out the repo'
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: 'Set up QEMU'
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: 'Set up Docker Buildx'
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: 'Build Container images'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: 5.0/${{ matrix.context }}
           push: false

3.0/apache/Dockerfile

@@ -3,48 +3,68 @@ LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
 RUN set -ex; \
-        apt-get update && \
+        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends \
-        apt-get install --no-install-recommends -y \
+                netcat \
+        ; \
         \
-        libldap2-dev \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        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
+# hadolint ignore=SC2086
 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 && \
+        savedAptMark="$(apt-mark showmanual)"; \
-        docker-php-ext-install -j5 \
+        \
-        exif \
+        apt-get update; \
-        gd \
+        apt-get install -y --no-install-recommends \
-        imap \
+                libldap2-dev \
-        ldap \
+                libfreetype6-dev \
-        mbstring \
+                libjpeg-dev \
-        pdo \
+                libonig-dev \
-        pdo_mysql \
+                zlib1g-dev \
-        pdo_pgsql \
+                libc-client-dev \
-        pgsql \
+                libkrb5-dev \
-        sodium \
+                libpng-dev \
-        tidy \
+                libpq-dev \
-        zip
+                libzip-dev \
+                libtidy-dev \
+                libsodium-dev \
+        ; \
+        \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+        docker-php-ext-configure gd --with-freetype --with-jpeg; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+        docker-php-ext-install -j "$(nproc)" \
+                exif \
+                gd \
+                imap \
+                ldap \
+                mbstring \
+                pdo \
+                pdo_mysql \
+                pdo_pgsql \
+                pgsql \
+                sodium \
+                tidy \
+                zip \
+        ; \
+        \
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+        apt-mark auto '.*' > /dev/null; \
+        apt-mark manual $savedAptMark; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '/=>/ { print $3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
+        \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+        rm -rf /var/lib/apt/lists/*
 
 # Apache configuration
 RUN a2enmod headers rewrite remoteip; \
@@ -59,14 +79,14 @@ 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.56+230404"
+ARG version="3.28.59+230517"
-ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
+ARG sha256_checksum="e048eaaf5260a8d6391609c355bb4df8c8ef0e0943b2d612d2a8414956db622a"
 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) 
+# 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 - && \

3.0/fpm-alpine/Dockerfile

@@ -2,6 +2,10 @@ FROM docker.io/php:8.0-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
+RUN apk add --no-cache netcat-openbsd bash
+
+# Install PHP Plugins
+# hadolint ignore=SC2086
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
         freetype-dev \
@@ -13,14 +17,13 @@ RUN set -ex; \
         openldap-dev \
         oniguruma-dev \
         imap-dev \
-        postgresql-dev && \
+        postgresql-dev \
-        apk add --no-cache netcat-openbsd bash
+    ; \
-
+    \
-# Install PHP Plugins
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
-RUN set -ex; \
+    docker-php-ext-configure imap --with-imap-ssl; \
-        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
+    docker-php-ext-install -j "$(nproc)" \
-        docker-php-ext-configure imap --with-imap-ssl && \
+        exif \
-        docker-php-ext-install \
         gd \
         imap \
         ldap \
@@ -31,14 +34,24 @@ RUN set -ex; \
         pgsql \
         sodium \
         tidy \
-        zip
+        zip \
+    ; \
+    \
+    runDeps="$( \
+        scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+            | tr ',' '\n' \
+            | sort -u \
+            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+    )"; \
+    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
+    apk del --no-cache --no-network .build-deps
 
-ARG version="3.28.56+230404"
+ARG version="3.28.59+230517"
-ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
+ARG sha256_checksum="e048eaaf5260a8d6391609c355bb4df8c8ef0e0943b2d612d2a8414956db622a"
 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 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 - && \

3.0/fpm/Dockerfile

@@ -3,55 +3,75 @@ LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
 RUN set -ex; \
-        apt-get update && \
+        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends \
-        apt-get install --no-install-recommends -y \
+                netcat \
+        ; \
         \
-        libldap2-dev \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        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
+# hadolint ignore=SC2086
 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 && \
+        savedAptMark="$(apt-mark showmanual)"; \
-        docker-php-ext-install -j5 \
+        \
-        exif \
+        apt-get update; \
-        gd \
+        apt-get install -y --no-install-recommends \
-        imap \
+                libldap2-dev \
-        ldap \
+                libfreetype6-dev \
-        mbstring \
+                libjpeg-dev \
-        pdo \
+                libonig-dev \
-        pdo_mysql \
+                zlib1g-dev \
-        pdo_pgsql \
+                libc-client-dev \
-        pgsql \
+                libkrb5-dev \
-        sodium \
+                libpng-dev \
-        tidy \
+                libpq-dev \
-        zip
+                libzip-dev \
+                libtidy-dev \
+                libsodium-dev \
+        ; \
+        \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+        docker-php-ext-configure gd --with-freetype --with-jpeg; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+        docker-php-ext-install -j "$(nproc)" \
+                exif \
+                gd \
+                imap \
+                ldap \
+                mbstring \
+                pdo \
+                pdo_mysql \
+                pdo_pgsql \
+                pgsql \
+                sodium \
+                tidy \
+                zip \
+        ; \
+        \
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+        apt-mark auto '.*' > /dev/null; \
+        apt-mark manual $savedAptMark; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '/=>/ { print $3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
+        \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+        rm -rf /var/lib/apt/lists/*
 
-ARG version="3.28.56+230404"
+ARG version="3.28.59+230517"
-ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
+ARG sha256_checksum="e048eaaf5260a8d6391609c355bb4df8c8ef0e0943b2d612d2a8414956db622a"
 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 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 - && \

5.0/apache/Dockerfile

@@ -3,49 +3,70 @@ LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
 RUN set -ex; \
-        apt-get update && \
+        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends \
-        apt-get install --no-install-recommends -y \
+                netcat-openbsd \
+                libldap-common \
+                libsasl2-modules \
+        ; \
         \
-        libldap2-dev \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        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
+# hadolint ignore=SC2086
 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 && \
+        savedAptMark="$(apt-mark showmanual)"; \
-        docker-php-ext-install -j5 \
+        \
-        exif \
+        apt-get update; \
-        gd \
+        apt-get install -y --no-install-recommends \
-        imap \
+                libldap2-dev \
-        ldap \
+                libfreetype6-dev \
-        mbstring \
+                libjpeg-dev \
-        pdo \
+                libonig-dev \
-        pdo_mysql \
+                zlib1g-dev \
-        pdo_pgsql \
+                libc-client-dev \
-        pgsql \
+                libkrb5-dev \
-        sodium \
+                libpng-dev \
-        tidy \
+                libpq-dev \
-        zip
+                libzip-dev \
+                libtidy-dev \
+                libsodium-dev \
+        ; \
+        \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+        docker-php-ext-configure gd --with-freetype --with-jpeg; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+        docker-php-ext-install -j "$(nproc)" \
+                exif \
+                gd \
+                imap \
+                ldap \
+                mbstring \
+                pdo \
+                pdo_mysql \
+                pdo_pgsql \
+                pgsql \
+                sodium \
+                tidy \
+                zip \
+        ; \
+        \
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+        apt-mark auto '.*' > /dev/null; \
+        apt-mark manual $savedAptMark; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '/=>/ { print $3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
+        \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+        rm -rf /var/lib/apt/lists/*
 
 # Apache configuration
 RUN a2enmod headers rewrite remoteip; \
@@ -60,14 +81,14 @@ 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.6.17+230426"
+ARG version="5.6.53+240131"
-ARG sha256_checksum="dd1773d8c4bf03f66bc6e2d137b1c570bf8db02bfd6e85e5d6ce9927df6f277d"
+ARG sha256_checksum="bfe4f51b6b43560314f38b01b913c8fed29d17de420cd480b2426d5f300f654c"
-ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${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) 
+# 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 - && \

5.0/apache/entrypoint.sh

@@ -1,6 +1,23 @@
 #!/bin/bash
 # Entrypoint for Docker Container
 
+file_env() {
+        local v="$1"
+        local fv="${v}_FILE"
+        local default="${2:-}"
+        if [ "${!v:-}" ] && [ "${!fv:-}" ]; then
+            echo >&2 "$v and $fv are exclusive"
+            exit 1
+        fi
+        local val="$default"
+        if [ "${!v:-}" ]; then
+                val="${!v}"
+        elif [ "${!fv:-}" ]; then
+                val="$(< "${!fv}")"
+        fi
+        export "$v"="$val"
+        unset "$fv"
+}
 
 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
@@ -9,19 +26,19 @@ 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'}
+file_env 'DB_PASSWORD'
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+file_env 'ENCRYPT_KEYPAIR'
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+file_env 'ENCRYPT_PUBLIC_KEY'
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+file_env 'ENCRYPT_SECRET_KEY'
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+file_env 'ENCRYPT_NONCE'
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
+file_env 'ENCRYPT_SECRET_BOX_KEY'
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+file_env 'ADMIN_PASSWORD'
 
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
@@ -35,12 +52,12 @@ DEBUG_SQL=${DEBUG_SQL:-0}
 LISTEN_PORT=${LISTEN_PORT:-"8080"}
 
 if [ -z "$DB_PASSWORD" ]; then
-    echo >&2 'Error: Missing DB_PASSWORD'
+    echo >&2 'Error: Missing DB_PASSWORD or DB_PASSWORD_FILE'
     exit 1
 fi
 
 if [ -z "$ADMIN_PASSWORD" ]; then
-    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    echo >&2 'Error: Missing ADMIN_PASSWORD or ADMIN_PASSWORD_FILE'
     exit 1
 fi
 
@@ -136,7 +153,7 @@ 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 [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');

5.0/fpm-alpine/Dockerfile

@@ -2,6 +2,15 @@ FROM docker.io/php:8.0-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
+RUN set -ex; \
+        apk add --no-cache \
+        netcat-openbsd \
+        libsasl \
+        libldap \
+        bash
+
+# Install PHP Plugins
+# hadolint ignore=SC2086
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
         freetype-dev \
@@ -13,14 +22,12 @@ RUN set -ex; \
         openldap-dev \
         oniguruma-dev \
         imap-dev \
-        postgresql-dev && \
+        postgresql-dev \
-        apk add --no-cache netcat-openbsd bash
+    ; \
-
+    \
-# Install PHP Plugins
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
-RUN set -ex; \
+    docker-php-ext-configure imap --with-imap-ssl; \
-        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
+    docker-php-ext-install -j "$(nproc)" \
-        docker-php-ext-configure imap --with-imap-ssl && \
-        docker-php-ext-install \
         exif \
         gd \
         imap \
@@ -32,15 +39,25 @@ RUN set -ex; \
         pgsql \
         sodium \
         tidy \
-        zip
+        zip \
+    ; \
+    \
+    runDeps="$( \
+        scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+            | tr ',' '\n' \
+            | sort -u \
+            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+    )"; \
+    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
+    apk del --no-cache --no-network .build-deps
 
-ARG version="5.6.17+230426"
+ARG version="5.6.53+240131"
-ARG sha256_checksum="dd1773d8c4bf03f66bc6e2d137b1c570bf8db02bfd6e85e5d6ce9927df6f277d"
+ARG sha256_checksum="bfe4f51b6b43560314f38b01b913c8fed29d17de420cd480b2426d5f300f654c"
-ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${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 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 - && \

5.0/fpm-alpine/entrypoint.sh

@@ -1,6 +1,23 @@
 #!/bin/bash
 # Entrypoint for Docker Container
 
+file_env() {
+        local v="$1"
+        local fv="${v}_FILE"
+        local default="${2:-}"
+        if [ "${!v:-}" ] && [ "${!fv:-}" ]; then
+            echo >&2 "$v and $fv are exclusive"
+            exit 1
+        fi
+        local val="$default"
+        if [ "${!v:-}" ]; then
+                val="${!v}"
+        elif [ "${!fv:-}" ]; then
+                val="$(< "${!fv}")"
+        fi
+        export "$v"="$val"
+        unset "$fv"
+}
 
 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
@@ -9,19 +26,19 @@ 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'}
+file_env 'DB_PASSWORD'
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+file_env 'ENCRYPT_KEYPAIR'
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+file_env 'ENCRYPT_PUBLIC_KEY'
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+file_env 'ENCRYPT_SECRET_KEY'
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+file_env 'ENCRYPT_NONCE'
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
+file_env 'ENCRYPT_SECRET_BOX_KEY'
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+file_env 'ADMIN_PASSWORD'
 
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
@@ -33,12 +50,12 @@ DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
 
 if [ -z "$DB_PASSWORD" ]; then
-    echo >&2 'Error: Missing DB_PASSWORD'
+    echo >&2 'Error: Missing DB_PASSWORD or DB_PASSWORD_FILE'
     exit 1
 fi
 
 if [ -z "$ADMIN_PASSWORD" ]; then
-    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    echo >&2 'Error: Missing ADMIN_PASSWORD or ADMIN_PASSWORD_FILE'
     exit 1
 fi
 
@@ -129,7 +146,7 @@ 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 [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');

5.0/fpm/Dockerfile

@@ -3,56 +3,78 @@ LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
 RUN set -ex; \
-        apt-get update && \
+        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends \
-        apt-get install --no-install-recommends -y \
+                netcat-openbsd \
+                libldap-common \
+                libsasl2-modules \
+        ; \
         \
-        libldap2-dev \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        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
+# hadolint ignore=SC2086
 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 && \
+        savedAptMark="$(apt-mark showmanual)"; \
-        docker-php-ext-install -j5 \
+        \
-        exif \
+        apt-get update; \
-        gd \
+        apt-get install -y --no-install-recommends \
-        imap \
+                libldap2-dev \
-        ldap \
+                libfreetype6-dev \
-        mbstring \
+                libjpeg-dev \
-        pdo \
+                libonig-dev \
-        pdo_mysql \
+                zlib1g-dev \
-        pdo_pgsql \
+                libc-client-dev \
-        pgsql \
+                libkrb5-dev \
-        sodium \
+                libpng-dev \
-        tidy \
+                libpq-dev \
-        zip
+                libzip-dev \
+                libtidy-dev \
+                libsodium-dev \
+        ; \
+        \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+        docker-php-ext-configure gd --with-freetype --with-jpeg; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+        docker-php-ext-install -j "$(nproc)" \
+                exif \
+                gd \
+                imap \
+                ldap \
+                mbstring \
+                pdo \
+                pdo_mysql \
+                pdo_pgsql \
+                pgsql \
+                sodium \
+                tidy \
+                zip \
+        ; \
+        \
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+        apt-mark auto '.*' > /dev/null; \
+        apt-mark manual $savedAptMark; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '/=>/ { print $3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
+        \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+        rm -rf /var/lib/apt/lists/*
 
-ARG version="5.6.17+230426"
+ARG version="5.6.53+240131"
-ARG sha256_checksum="dd1773d8c4bf03f66bc6e2d137b1c570bf8db02bfd6e85e5d6ce9927df6f277d"
+ARG sha256_checksum="bfe4f51b6b43560314f38b01b913c8fed29d17de420cd480b2426d5f300f654c"
-ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${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 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 - && \

5.0/fpm/entrypoint.sh

@@ -1,6 +1,23 @@
 #!/bin/bash
 # Entrypoint for Docker Container
 
+file_env() {
+        local v="$1"
+        local fv="${v}_FILE"
+        local default="${2:-}"
+        if [ "${!v:-}" ] && [ "${!fv:-}" ]; then
+            echo >&2 "$v and $fv are exclusive"
+            exit 1
+        fi
+        local val="$default"
+        if [ "${!v:-}" ]; then
+                val="${!v}"
+        elif [ "${!fv:-}" ]; then
+                val="$(< "${!fv}")"
+        fi
+        export "$v"="$val"
+        unset "$fv"
+}
 
 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
@@ -9,19 +26,19 @@ 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'}
+file_env 'DB_PASSWORD'
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+file_env 'ENCRYPT_KEYPAIR'
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+file_env 'ENCRYPT_PUBLIC_KEY'
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+file_env 'ENCRYPT_SECRET_KEY'
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+file_env 'ENCRYPT_NONCE'
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
+file_env 'ENCRYPT_SECRET_BOX_KEY'
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+file_env 'ADMIN_PASSWORD'
 
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
@@ -33,12 +50,12 @@ DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
 
 if [ -z "$DB_PASSWORD" ]; then
-    echo >&2 'Error: Missing DB_PASSWORD'
+    echo >&2 'Error: Missing DB_PASSWORD or DB_PASSWORD_FILE'
     exit 1
 fi
 
 if [ -z "$ADMIN_PASSWORD" ]; then
-    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    echo >&2 'Error: Missing ADMIN_PASSWORD or ADMIN_PASSWORD_FILE'
     exit 1
 fi
 
@@ -129,7 +146,7 @@ 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 [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');

6.0/apache/Dockerfile

@@ -3,49 +3,77 @@ LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
 RUN set -ex; \
-        apt-get update && \
+        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends \
-        apt-get install --no-install-recommends -y \
+                netcat-openbsd \
+                libldap-common \
+                libsasl2-modules \
+        ; \
         \
-        libldap2-dev \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        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
+# hadolint ignore=SC2086
 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 && \
+        savedAptMark="$(apt-mark showmanual)"; \
-        docker-php-ext-install -j5 \
+        \
-        exif \
+        apt-get update; \
-        gd \
+        apt-get install -y --no-install-recommends \
-        imap \
+                libldap2-dev \
-        ldap \
+                libfreetype6-dev \
-        mbstring \
+                libjpeg-dev \
-        pdo \
+                libonig-dev \
-        pdo_mysql \
+                zlib1g-dev \
-        pdo_pgsql \
+                libc-client-dev \
-        pgsql \
+                libkrb5-dev \
-        sodium \
+                libpng-dev \
-        tidy \
+                libpq-dev \
-        zip
+                libzip-dev \
+                libtidy-dev \
+                libsodium-dev \
+        ; \
+        \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+        docker-php-ext-configure gd --with-freetype --with-jpeg; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+        docker-php-ext-install -j "$(nproc)" \
+                exif \
+                gd \
+                imap \
+                ldap \
+                mbstring \
+                pdo \
+                pdo_mysql \
+                pdo_pgsql \
+                pgsql \
+                sodium \
+                tidy \
+                zip \
+        ; \
+        \
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+        apt-mark auto '.*' > /dev/null; \
+        apt-mark manual $savedAptMark; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '/=>/ { print $3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '$3 ~ /^\/lib/ { print "/usr"$3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
+        \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+        rm -rf /var/lib/apt/lists/*
 
 # Apache configuration
 RUN a2enmod headers rewrite remoteip; \
@@ -60,9 +88,9 @@ 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="6.0.4+230427"
+ARG version="6.4.5+240205"
-ARG sha256_checksum="05f95ba3d0591402263cc9bf5b9fdb8603f6dba3ece2dbf1be795ad7ba7fa8c2"
+ARG sha256_checksum="96318c85ddf2fd5b6af91f3eb67843ca74ff293f4ac79a016c26710a60b5bda1"
-ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ARG LISTEN_PORT=8080
 ENV LIMESURVEY_VERSION=$version

6.0/apache/entrypoint.sh

@@ -1,6 +1,23 @@
 #!/bin/bash
 # Entrypoint for Docker Container
 
+file_env() {
+        local v="$1"
+        local fv="${v}_FILE"
+        local default="${2:-}"
+        if [ "${!v:-}" ] && [ "${!fv:-}" ]; then
+            echo >&2 "$v and $fv are exclusive"
+            exit 1
+        fi
+        local val="$default"
+        if [ "${!v:-}" ]; then
+                val="${!v}"
+        elif [ "${!fv:-}" ]; then
+                val="$(< "${!fv}")"
+        fi
+        export "$v"="$val"
+        unset "$fv"
+}
 
 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
@@ -9,19 +26,19 @@ 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'}
+file_env 'DB_PASSWORD'
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+file_env 'ENCRYPT_KEYPAIR'
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+file_env 'ENCRYPT_PUBLIC_KEY'
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+file_env 'ENCRYPT_SECRET_KEY'
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+file_env 'ENCRYPT_NONCE'
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
+file_env 'ENCRYPT_SECRET_BOX_KEY'
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+file_env 'ADMIN_PASSWORD'
 
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
@@ -35,12 +52,12 @@ DEBUG_SQL=${DEBUG_SQL:-0}
 LISTEN_PORT=${LISTEN_PORT:-"8080"}
 
 if [ -z "$DB_PASSWORD" ]; then
-    echo >&2 'Error: Missing DB_PASSWORD'
+    echo >&2 'Error: Missing DB_PASSWORD or DB_PASSWORD_FILE'
     exit 1
 fi
 
 if [ -z "$ADMIN_PASSWORD" ]; then
-    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    echo >&2 'Error: Missing ADMIN_PASSWORD or ADMIN_PASSWORD_FILE'
     exit 1
 fi
 
@@ -136,7 +153,7 @@ 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 [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');

6.0/fpm-alpine/Dockerfile

@@ -2,6 +2,15 @@ FROM docker.io/php:8.1-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
+RUN set -ex; \
+        apk add --no-cache \
+        netcat-openbsd \
+        libsasl \
+        libldap \
+        bash
+
+# Install PHP Plugins
+# hadolint ignore=SC2086
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
         freetype-dev \
@@ -13,14 +22,12 @@ RUN set -ex; \
         openldap-dev \
         oniguruma-dev \
         imap-dev \
-        postgresql-dev && \
+        postgresql-dev \
-        apk add --no-cache netcat-openbsd bash
+    ; \
-
+    \
-# Install PHP Plugins
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
-RUN set -ex; \
+    docker-php-ext-configure imap --with-imap-ssl; \
-        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
+    docker-php-ext-install -j "$(nproc)" \
-        docker-php-ext-configure imap --with-imap-ssl && \
-        docker-php-ext-install \
         exif \
         gd \
         imap \
@@ -32,11 +39,21 @@ RUN set -ex; \
         pgsql \
         sodium \
         tidy \
-        zip
+        zip \
+    ; \
+    \
+    runDeps="$( \
+        scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+            | tr ',' '\n' \
+            | sort -u \
+            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+    )"; \
+    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
+    apk del --no-cache --no-network .build-deps
 
-ARG version="6.0.4+230427"
+ARG version="6.4.5+240205"
-ARG sha256_checksum="05f95ba3d0591402263cc9bf5b9fdb8603f6dba3ece2dbf1be795ad7ba7fa8c2"
+ARG sha256_checksum="96318c85ddf2fd5b6af91f3eb67843ca74ff293f4ac79a016c26710a60b5bda1"
-ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
 

6.0/fpm-alpine/entrypoint.sh

@@ -1,6 +1,23 @@
 #!/bin/bash
 # Entrypoint for Docker Container
 
+file_env() {
+        local v="$1"
+        local fv="${v}_FILE"
+        local default="${2:-}"
+        if [ "${!v:-}" ] && [ "${!fv:-}" ]; then
+            echo >&2 "$v and $fv are exclusive"
+            exit 1
+        fi
+        local val="$default"
+        if [ "${!v:-}" ]; then
+                val="${!v}"
+        elif [ "${!fv:-}" ]; then
+                val="$(< "${!fv}")"
+        fi
+        export "$v"="$val"
+        unset "$fv"
+}
 
 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
@@ -9,19 +26,19 @@ 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'}
+file_env 'DB_PASSWORD'
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+file_env 'ENCRYPT_KEYPAIR'
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+file_env 'ENCRYPT_PUBLIC_KEY'
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+file_env 'ENCRYPT_SECRET_KEY'
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+file_env 'ENCRYPT_NONCE'
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
+file_env 'ENCRYPT_SECRET_BOX_KEY'
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+file_env 'ADMIN_PASSWORD'
 
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
@@ -33,12 +50,12 @@ DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
 
 if [ -z "$DB_PASSWORD" ]; then
-    echo >&2 'Error: Missing DB_PASSWORD'
+    echo >&2 'Error: Missing DB_PASSWORD or DB_PASSWORD_FILE'
     exit 1
 fi
 
 if [ -z "$ADMIN_PASSWORD" ]; then
-    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    echo >&2 'Error: Missing ADMIN_PASSWORD or ADMIN_PASSWORD_FILE'
     exit 1
 fi
 
@@ -129,7 +146,7 @@ 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 [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');

6.0/fpm/Dockerfile

@@ -3,52 +3,81 @@ LABEL maintainer="markus@martialblog.de"
 
 # Install OS dependencies
 RUN set -ex; \
-        apt-get update && \
+        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive \
+        apt-get install -y --no-install-recommends \
-        apt-get install --no-install-recommends -y \
+                netcat-openbsd \
+                libldap-common \
+                libsasl2-modules \
+        ; \
         \
-        libldap2-dev \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        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
+# hadolint ignore=SC2086
 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 && \
+        savedAptMark="$(apt-mark showmanual)"; \
-        docker-php-ext-install -j5 \
+        \
-        exif \
+        apt-get update; \
-        gd \
+        apt-get install -y --no-install-recommends \
-        imap \
+                libldap2-dev \
-        ldap \
+                libfreetype6-dev \
-        mbstring \
+                libjpeg-dev \
-        pdo \
+                libonig-dev \
-        pdo_mysql \
+                zlib1g-dev \
-        pdo_pgsql \
+                libc-client-dev \
-        pgsql \
+                libkrb5-dev \
-        sodium \
+                libpng-dev \
-        tidy \
+                libpq-dev \
-        zip
+                libzip-dev \
+                libtidy-dev \
+                libsodium-dev \
+        ; \
+        \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+        docker-php-ext-configure gd --with-freetype --with-jpeg; \
+        docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+        docker-php-ext-install -j "$(nproc)" \
+                exif \
+                gd \
+                imap \
+                ldap \
+                mbstring \
+                pdo \
+                pdo_mysql \
+                pdo_pgsql \
+                pgsql \
+                sodium \
+                tidy \
+                zip \
+        ; \
+        \
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+        apt-mark auto '.*' > /dev/null; \
+        apt-mark manual $savedAptMark; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '/=>/ { print $3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '$3 ~ /^\/lib/ { print "/usr"$3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
+        \
+        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+        rm -rf /var/lib/apt/lists/*
 
-ARG version="6.0.4+230427"
+ARG version="6.4.5+240205"
-ARG sha256_checksum="05f95ba3d0591402263cc9bf5b9fdb8603f6dba3ece2dbf1be795ad7ba7fa8c2"
+ARG sha256_checksum="96318c85ddf2fd5b6af91f3eb67843ca74ff293f4ac79a016c26710a60b5bda1"
-ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
+ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
 

6.0/fpm/entrypoint.sh

@@ -1,6 +1,23 @@
 #!/bin/bash
 # Entrypoint for Docker Container
 
+file_env() {
+        local v="$1"
+        local fv="${v}_FILE"
+        local default="${2:-}"
+        if [ "${!v:-}" ] && [ "${!fv:-}" ]; then
+            echo >&2 "$v and $fv are exclusive"
+            exit 1
+        fi
+        local val="$default"
+        if [ "${!v:-}" ]; then
+                val="${!v}"
+        elif [ "${!fv:-}" ]; then
+                val="$(< "${!fv}")"
+        fi
+        export "$v"="$val"
+        unset "$fv"
+}
 
 DB_TYPE=${DB_TYPE:-'mysql'}
 DB_HOST=${DB_HOST:-'mysql'}
@@ -9,19 +26,19 @@ 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'}
+file_env 'DB_PASSWORD'
 
-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
+file_env 'ENCRYPT_KEYPAIR'
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
+file_env 'ENCRYPT_PUBLIC_KEY'
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+file_env 'ENCRYPT_SECRET_KEY'
-ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+file_env 'ENCRYPT_NONCE'
-ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}
+file_env 'ENCRYPT_SECRET_BOX_KEY'
 
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
+file_env 'ADMIN_PASSWORD'
 
 BASE_URL=${BASE_URL:-}
 PUBLIC_URL=${PUBLIC_URL:-}
@@ -33,12 +50,12 @@ DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}
 
 if [ -z "$DB_PASSWORD" ]; then
-    echo >&2 'Error: Missing DB_PASSWORD'
+    echo >&2 'Error: Missing DB_PASSWORD or DB_PASSWORD_FILE'
     exit 1
 fi
 
 if [ -z "$ADMIN_PASSWORD" ]; then
-    echo >&2 'Error: Missing ADMIN_PASSWORD'
+    echo >&2 'Error: Missing ADMIN_PASSWORD or ADMIN_PASSWORD_FILE'
     exit 1
 fi
 
@@ -129,7 +146,7 @@ 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 [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');

README.md

@@ -115,10 +115,10 @@ If you are running LimeSurvey behind a Reverse Proxy you might need some additio
 | DB_MYSQL_ENGINE | MySQL engine used for survey tables (values: MyISAM, InnoDB, default: MyISAM)       |
 | DB_USERNAME     | Database user                             |
 | DB_PASSWORD     | Database user's password                  |
-| ADMIN_USER      | Initial LimeSurvey Admin User             |
+| ADMIN_USER      | Initial LimeSurvey Admin Username (for signing into admin panel)             |
-| ADMIN_NAME      | Initial LimeSurvey Admin Username         |
+| ADMIN_NAME      | Initial LimeSurvey Admin Name             |
 | ADMIN_EMAIL     | Initial LimeSurvey Admin Email            |
-| ADMIN_PASSWORD  | Initial LimeSurvey Admin Password         |
+| ADMIN_PASSWORD  | Initial LimeSurvey Admin Password (for signing into admin panel)         |
 | PUBLIC_URL      | Public URL for public scripts             |
 | BASE_URL        | Application Base URL                      |
 | URL_FORMAT      | URL Format. path or get                   |
@@ -133,12 +133,26 @@ If you are running LimeSurvey behind a Reverse Proxy you might need some additio
 | ENCRYPT_SECRET_BOX_KEY | Data encryption secret box key (used in 5.0 and higher) |
 | LISTEN_PORT     | Apache: Listen port. Default: 8080        |
 
+Sensitive information can also be passed `_FILE` to the following environment variables to load the values from the given file path. Example `DB_PASSWORD_FILE=/run/secrets/db_password`.
+
+```
+DB_PASSWORD_FILE
+ADMIN_PASSWORD_FILE
+ENCRYPT_KEYPAIR_FILE
+ENCRYPT_PUBLIC_KEY_FILE
+ENCRYPT_SECRET_KEY_FILE
+ENCRYPT_NONCE_FILE
+ENCRYPT_SECRET_BOX_KEY_FILE
+```
+
 For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
 
 # Running LimeSurvey 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).
 
+**Hint:** You need to configure a database and Limesurvey password in the `docker-compose` files before starting. No defaults are provided to discourage production use with default passwords.
+
 ```
 docker-compose up
 

docker-compose.apache.yml

@@ -8,8 +8,8 @@ services:
       - lime-db
     environment:
       - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
+      # - "DB_PASSWORD="
-      - "ADMIN_PASSWORD=foobar"
+      # - "ADMIN_PASSWORD="
       - "PUBLIC_URL=http://my.survey.localhost:8080"  # Example, Change this
       - "BASE_URL=http://my.survey.localhost:8080"  # Example, Change this
   proxy:
@@ -24,6 +24,6 @@ services:
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"
-      - "MYSQL_PASSWORD=secret"
+      # - "MYSQL_PASSWORD="
-      - "MYSQL_ROOT_PASSWORD=secret"
+      # - "MYSQL_ROOT_PASSWORD="
 

docker-compose.example.yml

@@ -7,12 +7,12 @@ services:
       - DB_TYPE=pgsql
       - DB_PORT=5432
       - DB_HOST=db
-      - DB_PASSWORD=example
+      # - DB_PASSWORD=
       - DB_NAME=limesurvey
       - DB_USERNAME=limesurvey
       - ADMIN_USER=admin
       - ADMIN_NAME=Admin
-      - ADMIN_PASSWORD=example
+      # - ADMIN_PASSWORD=
       - ADMIN_EMAIL=admin@example.com
       - PUBLIC_URL=foobar.com
     volumes:
@@ -25,11 +25,11 @@ services:
     image: docker.io/postgres:10-alpine
     restart: always
     volumes:
-      - db-data:/var/lib/postgresql
+      - db-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_USER=limesurvey
       - POSTGRES_DB=limesurvey
-      - POSTGRES_PASSWORD=example
+      # - POSTGRES_PASSWORD=
 
 volumes:
   limesurvey:

docker-compose.fpm-certbot.yml

@@ -14,9 +14,9 @@ services:
       - lime-db
     environment:
       - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
+      # - "DB_PASSWORD="
-      - "ADMIN_PASSWORD=foobar"
+      # - "ADMIN_PASSWORD="
-  lime-web:
+   lime-web:
     build:
       context: nginx-certbot/
       dockerfile: Dockerfile
@@ -44,7 +44,7 @@ services:
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"
-      - "MYSQL_PASSWORD=secret"
+      # - "MYSQL_PASSWORD="
-      - "MYSQL_ROOT_PASSWORD=secret"
+      # - "MYSQL_ROOT_PASSWORD="
 volumes:
   lime:

docker-compose.fpm.alpine.yml

@@ -14,8 +14,8 @@ services:
       - lime-db
     environment:
       - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
+      # - "DB_PASSWORD="
-      - "ADMIN_PASSWORD=foobar"
+      # - "ADMIN_PASSWORD="
   lime-web:
     image: docker.io/nginx:alpine
     links:
@@ -32,7 +32,7 @@ services:
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"
-      - "MYSQL_PASSWORD=secret"
+      # - "MYSQL_PASSWORD="
-      - "MYSQL_ROOT_PASSWORD=secret"
+      # - "MYSQL_ROOT_PASSWORD="
 volumes:
   lime:

docker-compose.fpm.yml

@@ -14,8 +14,8 @@ services:
       - lime-db
     environment:
       - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
+      # - "DB_PASSWORD="
-      - "ADMIN_PASSWORD=foobar"
+      # - "ADMIN_PASSWORD="
   lime-web:
     image: docker.io/nginx
     links:
@@ -30,7 +30,7 @@ services:
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"
-      - "MYSQL_PASSWORD=secret"
+      # - "MYSQL_PASSWORD="
-      - "MYSQL_ROOT_PASSWORD=secret"
+      # - "MYSQL_ROOT_PASSWORD="
 volumes:
   lime:

docker-compose.pgsql.yml

@@ -19,8 +19,8 @@ services:
       - "DB_TYPE=pgsql"
       - "DB_PORT=5432"
       - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
+      # - "DB_PASSWORD="
-      - "ADMIN_PASSWORD=foobar"
+      # - "ADMIN_PASSWORD="
   lime-db:
     image: docker.io/postgres:10
     volumes:
@@ -28,7 +28,7 @@ services:
     environment:
       - "POSTGRES_USER=limesurvey"
       - "POSTGRES_DB=limesurvey"
-      - "POSTGRES_PASSWORD=secret"
+      # - "POSTGRES_PASSWORD="
 
 volumes:
   db-data:

docker-compose.traefik.domain.yml

@@ -15,8 +15,8 @@ services:
       - lime-db
     environment:
       - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
+      # - "DB_PASSWORD="
-      - "ADMIN_PASSWORD=foobar"
+      # - "ADMIN_PASSWORD="
       - "PUBLIC_URL=http://my.survey.localhost:8888"
       - "BASE_URL=http://my.survey.localhost:8888"
   traefik:
@@ -37,6 +37,5 @@ services:
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"
-      - "MYSQL_PASSWORD=secret"
+      # - "MYSQL_PASSWORD="
-      - "MYSQL_ROOT_PASSWORD=secret"
+      # - "MYSQL_ROOT_PASSWORD="
-

docker-compose.traefik.yml

@@ -19,8 +19,8 @@ services:
       - "./examples/apache-example.conf:/etc/apache2/sites-available/000-default.conf:ro"
     environment:
       - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
+      # - "DB_PASSWORD="
-      - "ADMIN_PASSWORD=foobar"
+      # - "ADMIN_PASSWORD="
       - "PUBLIC_URL=http://localhost:8888/limesurvey"
       - "BASE_URL=http://localhost:8888/limesurvey"
   traefik:
@@ -41,6 +41,5 @@ services:
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"
-      - "MYSQL_PASSWORD=secret"
+      # - "MYSQL_PASSWORD="
-      - "MYSQL_ROOT_PASSWORD=secret"
+      # - "MYSQL_ROOT_PASSWORD="
-

docker-compose.yml

@@ -15,8 +15,8 @@ services:
       - "8080:8080"
     environment:
       - "DB_HOST=lime-db"
-      - "DB_PASSWORD=secret"
+      # - "DB_PASSWORD="
-      - "ADMIN_PASSWORD=foobar"
+      # - "ADMIN_PASSWORD="
       # If you require an empty table prefix, use a space as the DB_TABLE_PREFIX
       # - "DB_TABLE_PREFIX= "
   lime-db:
@@ -24,5 +24,5 @@ services:
     environment:
       - "MYSQL_USER=limesurvey"
       - "MYSQL_DATABASE=limesurvey"
-      - "MYSQL_PASSWORD=secret"
+      # - "MYSQL_PASSWORD="
-      - "MYSQL_ROOT_PASSWORD=secret"
+      # - "MYSQL_ROOT_PASSWORD="

tests/apache-tests.yaml

@@ -51,30 +51,6 @@ commandTests:
     command: "dpkg"
     args: ["-l", "netcat"]
     exitCode: 0
-  - name:  "Dependencies - libldap2-dev"
-    command: "dpkg"
-    args: ["-l", "libldap2-dev"]
-    exitCode: 0
-  - name:  "Dependencies - zlib1g-dev"
-    command: "dpkg"
-    args: ["-l", "zlib1g-dev"]
-    exitCode: 0
-  - name:  "Dependencies - libc-client-dev"
-    command: "dpkg"
-    args: ["-l", "libc-client-dev"]
-    exitCode: 0
-  - name:  "Dependencies - libkrb5-dev"
-    command: "dpkg"
-    args: ["-l", "libkrb5-dev"]
-    exitCode: 0
-  - name:  "Dependencies - libpng-dev"
-    command: "dpkg"
-    args: ["-l", "libpng-dev"]
-    exitCode: 0
-  - name:  "Dependencies - libpq-dev"
-    command: "dpkg"
-    args: ["-l", "libpq-dev"]
-    exitCode: 0
   - name:  "Dependencies - PHP Modules"
     command: "php"
     args: ["-m"]