Upgrading to Version 4.4.14+210322

Upgrading to LTS Version 3.25.19+210323
Merge pull request #53 from martialblog/hadolint
2025-12-06 16:39:11 +01:00 · 2021-03-30 08:00:45 +02:00 · 2021-03-30 07:59:56 +02:00 · 2021-03-22 20:14:46 +01:00 · 2021-03-22 20:06:08 +01:00 · 2021-03-22 20:05:30 +01:00
8 changed files with 68 additions and 31 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,17 @@ sudo: required
 language: bash
 services:
  - docker
-
-matrix:
+install:
+jobs:
  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 3.0/apache; docker build -q -t $TAG . && cd ../..; ./tests/run.sh $TAG
+      script: cd 4.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
+      script: cd 4.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
+      script: cd 4.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.3+201208'
-ARG sha256_checksum='2f21bc21252844226f8f28e4b728fd9011acdaef970067ec67c065a56d4b7cc8'
+ARG version='3.25.19+210323'
+ARG sha256_checksum='b57b142cceb4a689a99897e5a94c9146c1c6dc0d6351f7648af54c25edb27084'

 # Install OS dependencies
 RUN set -ex; \
@@ -19,6 +19,8 @@ RUN set -ex; \
        libpng-dev \
        libpq-dev \
        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -30,7 +32,7 @@ RUN set -ex; \

 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd && \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
@@ -42,6 +44,8 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
+        sodium \
+        tidy \
        zip

 ENV LIMESURVEY_VERSION=$version
@@ -69,7 +73,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.3+201208'
-ARG sha256_checksum='2f21bc21252844226f8f28e4b728fd9011acdaef970067ec67c065a56d4b7cc8'
+ARG version='3.25.19+210323'
+ARG sha256_checksum='b57b142cceb4a689a99897e5a94c9146c1c6dc0d6351f7648af54c25edb27084'

 # Install OS dependencies
 RUN set -ex; \
@@ -10,6 +10,8 @@ RUN set -ex; \
        libpng-dev \
        libzip-dev \
        libjpeg-turbo-dev \
+        tidyhtml-dev \
+        libsodium-dev \
        openldap-dev \
        oniguruma-dev \
        imap-dev \
@@ -18,7 +20,7 @@ RUN set -ex; \

 # Install PHP Plugins
 RUN set -ex; \
-        docker-php-ext-configure gd && \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
        docker-php-ext-configure imap --with-imap-ssl && \
        docker-php-ext-install \
        gd \
@@ -29,6 +31,8 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
+        sodium \
+        tidy \
        zip

 # Download, unzip and chmod of LimeSurvey
@@ -48,6 +52,7 @@ 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.3+201208'
-ARG sha256_checksum='2f21bc21252844226f8f28e4b728fd9011acdaef970067ec67c065a56d4b7cc8'
+ARG version='3.25.19+210323'
+ARG sha256_checksum='b57b142cceb4a689a99897e5a94c9146c1c6dc0d6351f7648af54c25edb27084'

 # Install OS dependencies
 RUN set -ex; \
@@ -19,6 +19,8 @@ RUN set -ex; \
        libpng-dev \
        libpq-dev \
        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -30,7 +32,7 @@ RUN set -ex; \

 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd && \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
@@ -42,6 +44,8 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
+        sodium \
+        tidy \
        zip

 ENV LIMESURVEY_VERSION=$version
@@ -58,6 +62,7 @@ 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.3.30+201207'
-ARG sha256_checksum='635830d6fe95f9a4e8401885b3320611773014c64fb2d3ebfc26a58429d365c4'
+ARG version='4.4.14+210322'
+ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'

 # Install OS dependencies
 RUN set -ex; \
@@ -19,6 +19,8 @@ RUN set -ex; \
        libpng-dev \
        libpq-dev \
        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
        netcat \
        curl \
        \
@@ -31,7 +33,7 @@ RUN set -ex; \

 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd && \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
@@ -43,6 +45,8 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
+        sodium \
+        tidy \
        zip

 ENV LIMESURVEY_VERSION=$version
@@ -70,7 +74,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.3.30+201207'
-ARG sha256_checksum='635830d6fe95f9a4e8401885b3320611773014c64fb2d3ebfc26a58429d365c4'
+ARG version='4.4.14+210322'
+ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'

 # Install OS dependencies
 RUN set -ex; \
@@ -10,6 +10,8 @@ RUN set -ex; \
        libpng-dev \
        libzip-dev \
        libjpeg-turbo-dev \
+        tidyhtml-dev \
+        libsodium-dev \
        openldap-dev \
        oniguruma-dev \
        imap-dev \
@@ -18,7 +20,7 @@ RUN set -ex; \

 # Install PHP Plugins
 RUN set -ex; \
-        docker-php-ext-configure gd && \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
        docker-php-ext-configure imap --with-imap-ssl && \
        docker-php-ext-install \
        exif \
@@ -30,6 +32,8 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
+        sodium \
+        tidy \
        zip

 # Download, unzip and chmod of LimeSurvey
@@ -49,6 +53,7 @@ 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.3.30+201207'
-ARG sha256_checksum='635830d6fe95f9a4e8401885b3320611773014c64fb2d3ebfc26a58429d365c4'
+ARG version='4.4.14+210322'
+ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'

 # Install OS dependencies
 RUN set -ex; \
@@ -19,6 +19,8 @@ RUN set -ex; \
        libpng-dev \
        libpq-dev \
        libzip-dev \
+        libtidy-dev \
+        libsodium-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -30,7 +32,7 @@ RUN set -ex; \

 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
-        docker-php-ext-configure gd && \
+        docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
@@ -42,6 +44,8 @@ RUN set -ex; \
        pdo_mysql \
        pdo_pgsql \
        pgsql \
+        sodium \
+        tidy \
        zip

 ENV LIMESURVEY_VERSION=$version
@@ -58,6 +62,7 @@ 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,10 +1,14 @@
-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/*
+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/*

 COPY entrypoint.sh /entrypoint.sh
 RUN chmod 700 /entrypoint.sh
-
 CMD ["/entrypoint.sh"]
Author	SHA1	Message	Date
Markus Opolka	fceae6b3cd	Upgrading to Version 4.4.14+210322	2021-03-30 08:00:45 +02:00
Markus Opolka	b62a83ac83	Upgrading to LTS Version 3.25.19+210323	2021-03-30 07:59:56 +02:00
Markus Opolka	d106c2ceb6	Merge pull request #53 from martialblog/hadolint Add Hadolint to CI	2021-03-22 20:14:46 +01:00
Markus Opolka	0c4690c97a	Add hadolint to CI	2021-03-22 20:06:08 +01:00
Markus Opolka	ebb51363a1	Optimise nginx certbot example Dockerfile	2021-03-22 20:05:30 +01:00
Markus Opolka	debb4037a2	Upgrading to Version 4.4.13+210315	2021-03-22 19:45:58 +01:00
Markus Opolka	d7751f41d4	Upgrading to LTS Version 3.25.18+210316	2021-03-22 19:44:47 +01:00
Markus Opolka	47be732839	Merge pull request #52 from martialblog/fix-gd Fix gd installation and add tidy/sodium lib	2021-03-22 19:43:58 +01:00
Markus Opolka	7da025f19a	Fix gd installation and add tidy/sodium lib	2021-03-21 11:15:29 +01:00
Markus Opolka	cefd0a5c75	Upgrading to Version 4.4.12+210308	2021-03-16 06:29:22 +01:00
Markus Opolka	086903f0b4	Upgrading to LTS Version 3.25.17+210309	2021-03-16 06:28:36 +01:00
Markus Opolka	a619f5b8b7	Upgrading to Version 4.4.11+210301	2021-03-08 18:05:57 +01:00
Markus Opolka	f0c42a8bc2	Upgrading to LTS Version 3.25.16+210302	2021-03-08 18:05:00 +01:00
Markus Opolka	a6668c1fd2	Upgrading to Version 4.4.10+210222	2021-03-01 13:17:50 +01:00
Markus Opolka	ddcd2c868a	Upgrading to LTS Version 3.25.15+210223	2021-03-01 13:17:08 +01:00
Markus Opolka	e3c0c3a9d0	Upgrading to Version 4.4.9+210219	2021-02-23 07:26:49 +01:00
Markus Opolka	eb1354a42a	Upgrading to LTS Version 3.25.14+210218	2021-02-23 07:25:57 +01:00
Markus Opolka	448fb092a6	Upgrading to Version 4.4.8+210217	2021-02-17 16:16:10 +01:00
Markus Opolka	97c806aada	Upgrading to LTS Version 3.25.12+210211	2021-02-17 16:15:11 +01:00
Markus Opolka	263b64e9f9	Upgrading to Version 4.4.6+210214	2021-02-12 17:33:54 +01:00
Markus Opolka	bab97c1eab	Upgrading to Version 4.4.5+210213	2021-02-12 05:55:39 +01:00
Markus Opolka	064611ced5	Upgrading to Version 4.4.3+210209	2021-02-10 09:22:48 +01:00
Markus Opolka	c7ea723349	Upgrading to LTS Version 3.25.11+210210	2021-02-10 09:22:00 +01:00
Markus Opolka	81ec0452b9	Upgrading to Version 4.4.2+210208	2021-02-09 09:40:45 +01:00
Markus Opolka	eecb83fc99	Upgrading to LTS Version 3.25.10+210128	2021-02-09 09:38:44 +01:00
Markus Opolka	c2ad0c38cc	Upgrading to Version 4.4.0+210129	2021-02-02 07:52:34 +01:00
Markus Opolka	b2f25dac02	Upgrading to Version 4.3.34+210119	2021-01-29 07:22:49 +01:00
Markus Opolka	64ad7966fd	Upgrading to LTS Version 3.25.9+210125	2021-01-29 07:21:54 +01:00
Markus Opolka	9833519c9f	Upgrading to LTS Version 3.25.8+210118	2021-01-26 07:51:00 +01:00
Markus Opolka	7438aecf40	Upgrading to LTS Version 3.25.7+210113	2021-01-18 18:45:11 +01:00
Markus Opolka	80ebadd26d	Upgrading to Version 4.3.33+201228	2021-01-12 09:11:47 +01:00
Markus Opolka	d99c00d482	Upgrading to LTS Version 3.25.6+201229	2021-01-12 09:10:50 +01:00
Markus Opolka	a3d86a1779	Upgrading to LTS Version 3.25.5+201222	2020-12-29 18:19:22 +01:00
Markus Opolka	f008494a2d	Upgrading to Version 4.3.32+201221	2020-12-23 05:47:42 +01:00
Markus Opolka	a44db5df62	Upgrading to Version 4.3.31+201214	2020-12-21 15:10:48 +01:00
Markus Opolka	03a0d9a16e	Upgrading to LTS Version 3.25.4+201215	2020-12-21 15:09:51 +01:00