Upgrading to Version 4.3.31+201214

2025-12-06 16:39:11 +01:00 · 2020-12-21 15:07:16 +01:00
8 changed files with 31 additions and 68 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,17 +2,12 @@ sudo: required
 language: bash
 services:
  - docker
-install:
-jobs:
+
+matrix:
  include:
-    - env: HADOLINT="${HOME}/hadolint"
-      script:
-          - curl -sL -o ${HADOLINT} "https://github.com/hadolint/hadolint/releases/download/v1.23.0/hadolint-$(uname -s)-$(uname -m)"
-          - chmod 700 ${HADOLINT}
-          - git ls-files --exclude='Dockerfile*' --ignored | xargs --max-lines=1 ${HADOLINT} --ignore DL4006 --ignore DL3008 --ignore DL3018
    - env: TAG=martialblog/limesurvey-apache
-      script: cd 4.0/apache; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 3.0/apache; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
    - env: TAG=martialblog/limesurvey-fpm
-      script: cd 4.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 3.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
    - env: TAG=martialblog/limesurvey-alpine
-      script: cd 4.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 3.0/fpm; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
--- a/3.0/apache/Dockerfile
+++ b/3.0/apache/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.19+210323'
-ARG sha256_checksum='b57b142cceb4a689a99897e5a94c9146c1c6dc0d6351f7648af54c25edb27084'
+ARG version='3.25.4+201215'
+ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'

 # Install OS dependencies
 RUN set -ex; \
@@ -19,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; \
@@ -32,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 \
@@ -44,8 +42,6 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
-        sodium \
-        tidy \
        zip

 ENV LIMESURVEY_VERSION=$version
@@ -73,7 +69,7 @@ RUN set -ex; \
        rm -f "/tmp/limesurvey.tar.gz" && \
        chown -R www-data:www-data /var/www/html

-WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
+
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]
--- a/3.0/fpm-alpine/Dockerfile
+++ b/3.0/fpm-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.19+210323'
-ARG sha256_checksum='b57b142cceb4a689a99897e5a94c9146c1c6dc0d6351f7648af54c25edb27084'
+ARG version='3.25.4+201215'
+ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'

 # Install OS dependencies
 RUN set -ex; \
@@ -10,8 +10,6 @@ RUN set -ex; \
        libpng-dev \
        libzip-dev \
        libjpeg-turbo-dev \
-        tidyhtml-dev \
-        libsodium-dev \
        openldap-dev \
        oniguruma-dev \
        imap-dev \
@@ -20,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 \
@@ -31,8 +29,6 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
-        sodium \
-        tidy \
        zip

 # Download, unzip and chmod of LimeSurvey
@@ -52,7 +48,6 @@ RUN set -ex; \

 EXPOSE 9000

-WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]
--- a/3.0/fpm/Dockerfile
+++ b/3.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.19+210323'
-ARG sha256_checksum='b57b142cceb4a689a99897e5a94c9146c1c6dc0d6351f7648af54c25edb27084'
+ARG version='3.25.4+201215'
+ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'

 # Install OS dependencies
 RUN set -ex; \
@@ -19,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; \
@@ -32,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 \
@@ -44,8 +42,6 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
-        sodium \
-        tidy \
        zip

 ENV LIMESURVEY_VERSION=$version
@@ -62,7 +58,6 @@ RUN set -ex; \

 EXPOSE 9000

-WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]
--- a/4.0/apache/Dockerfile
+++ b/4.0/apache/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.14+210322'
-ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'
+ARG version='4.3.31+201214'
+ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'

 # Install OS dependencies
 RUN set -ex; \
@@ -19,8 +19,6 @@ RUN set -ex; \
        libpng-dev \
        libpq-dev \
        libzip-dev \
-        libtidy-dev \
-        libsodium-dev \
        netcat \
        curl \
        \
@@ -33,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 \
@@ -45,8 +43,6 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
-        sodium \
-        tidy \
        zip

 ENV LIMESURVEY_VERSION=$version
@@ -74,7 +70,7 @@ RUN set -ex; \
        rm -f "/tmp/limesurvey.tar.gz" && \
        chown -R www-data:www-data /var/www/html

-WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
+
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]
--- a/4.0/fpm-alpine/Dockerfile
+++ b/4.0/fpm-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.14+210322'
-ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'
+ARG version='4.3.31+201214'
+ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'

 # Install OS dependencies
 RUN set -ex; \
@@ -10,8 +10,6 @@ RUN set -ex; \
        libpng-dev \
        libzip-dev \
        libjpeg-turbo-dev \
-        tidyhtml-dev \
-        libsodium-dev \
        openldap-dev \
        oniguruma-dev \
        imap-dev \
@@ -20,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 \
@@ -32,8 +30,6 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
-        sodium \
-        tidy \
        zip

 # Download, unzip and chmod of LimeSurvey
@@ -53,7 +49,6 @@ RUN set -ex; \

 EXPOSE 9000

-WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]
--- a/4.0/fpm/Dockerfile
+++ b/4.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.14+210322'
-ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'
+ARG version='4.3.31+201214'
+ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'

 # Install OS dependencies
 RUN set -ex; \
@@ -19,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; \
@@ -32,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 \
@@ -44,8 +42,6 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
-        sodium \
-        tidy \
        zip

 ENV LIMESURVEY_VERSION=$version
@@ -62,7 +58,6 @@ RUN set -ex; \

 EXPOSE 9000

-WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["php-fpm"]
--- a/nginx-certbot/Dockerfile
+++ b/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"]