Upgrading to LTS Version 3.26.0+210419

Upgrading to Version 4.5.0+210412
Upgrading to LTS Version 3.25.22+210413
2025-12-06 16:39:11 +01:00 · 2021-04-26 19:01:38 +02:00 · 2021-04-19 17:53:54 +02:00 · 2021-04-19 17:51:31 +02:00 · 2021-04-12 17:02:11 +02:00 · 2021-04-12 17:01:30 +02:00
10 changed files with 77 additions and 32 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.14+210218'
-ARG sha256_checksum='c3de6d2dd867a7c44a7d95c7521299771be75512d7e718c9be539e95db3a7ddd'
+ARG version='3.26.0+210419'
+ARG sha256_checksum='419bd937bd0547b5f0c76379376276bbfe387cd92eb6dbf189e3a4974c9d0857'

 # 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.14+210218'
-ARG sha256_checksum='c3de6d2dd867a7c44a7d95c7521299771be75512d7e718c9be539e95db3a7ddd'
+ARG version='3.26.0+210419'
+ARG sha256_checksum='419bd937bd0547b5f0c76379376276bbfe387cd92eb6dbf189e3a4974c9d0857'

 # 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.14+210218'
-ARG sha256_checksum='c3de6d2dd867a7c44a7d95c7521299771be75512d7e718c9be539e95db3a7ddd'
+ARG version='3.26.0+210419'
+ARG sha256_checksum='419bd937bd0547b5f0c76379376276bbfe387cd92eb6dbf189e3a4974c9d0857'

 # 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.4.9+210219'
-ARG sha256_checksum='56d73eb0603eb23c12d3e6bb74b7e8f1fc2e2fdf32661b3605e0c0fd6c17dc0b'
+ARG version='4.5.0+210412'
+ARG sha256_checksum='601053b254424d76445b158da4a0f559f202528c2a7afb13c2364ab118329389'

 # 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.4.9+210219'
-ARG sha256_checksum='56d73eb0603eb23c12d3e6bb74b7e8f1fc2e2fdf32661b3605e0c0fd6c17dc0b'
+ARG version='4.5.0+210412'
+ARG sha256_checksum='601053b254424d76445b158da4a0f559f202528c2a7afb13c2364ab118329389'

 # 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.4.9+210219'
-ARG sha256_checksum='56d73eb0603eb23c12d3e6bb74b7e8f1fc2e2fdf32661b3605e0c0fd6c17dc0b'
+ARG version='4.5.0+210412'
+ARG sha256_checksum='601053b254424d76445b158da4a0f559f202528c2a7afb13c2364ab118329389'

 # 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/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -22,8 +22,10 @@ services:
    depends_on:
      - db
  db:
-    image: postgres:9.6-alpine
+    image: postgres:10-alpine
    restart: always
+    volumes:
+      - db-data:/var/lib/postgresql
    environment:
      - POSTGRES_USER=limesurvey
      - POSTGRES_DB=limesurvey
@@ -31,3 +33,4 @@ services:

 volumes:
  limesurvey:
+  db-data:
--- a/docker-compose.pgsql.yml
+++ b/docker-compose.pgsql.yml
@@ -20,7 +20,12 @@ services:
      - "ADMIN_PASSWORD=foobar"
  lime-db:
    image: postgres:10
+    volumes:
+      - db-data:/var/lib/postgresql
    environment:
      - "POSTGRES_USER=limesurvey"
      - "POSTGRES_DB=limesurvey"
      - "POSTGRES_PASSWORD=secret"
+
+volumes:
+  db-data:
--- 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	0f7900e237	Upgrading to LTS Version 3.26.0+210419	2021-04-26 19:01:38 +02:00
Markus Opolka	a782896897	Upgrading to Version 4.5.0+210412	2021-04-19 17:53:54 +02:00
Markus Opolka	ce70ec3000	Upgrading to LTS Version 3.25.22+210413	2021-04-19 17:51:31 +02:00
Markus Opolka	0403aa1208	Upgrading to Version 4.4.16+210406	2021-04-12 17:02:11 +02:00
Markus Opolka	5a011e6818	Upgrading to LTS Version 3.25.21+210407	2021-04-12 17:01:30 +02:00
Markus Opolka	bb23531c6d	Upgrading to Version 4.4.15+210329	2021-04-07 17:34:02 +02:00
Markus Opolka	69e8bcec7e	Upgrading to LTS Version 3.25.20+210330	2021-04-07 17:33:18 +02:00
Markus Opolka	d26552bb6f	Merge pull request #55 from PabloCastellano/master Use docker volumes for postgres database	2021-04-04 07:26:02 +02:00
Pablo Castellano	1360fb8001	Use docker volumes for postgres database	2021-04-03 11:26:30 +02:00
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