Upgrading to Version 4.5.1+210420

Use docker volumes for postgres database

.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

3.0/apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.1+201124'
-ARG sha256_checksum='a735501e282ea4a98a0b68044c2de11f300b796c74e3a36900c23d86aaad24fb'
+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"]

3.0/fpm-alpine/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.1+201124'
-ARG sha256_checksum='a735501e282ea4a98a0b68044c2de11f300b796c74e3a36900c23d86aaad24fb'
+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"]

3.0/fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.1+201124'
-ARG sha256_checksum='a735501e282ea4a98a0b68044c2de11f300b796c74e3a36900c23d86aaad24fb'
+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"]

4.0/apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.27+201116'
-ARG sha256_checksum='11273c6feaa3beca6f63f8c3c79b1cba56f2271d87ca0bf249e1ece2e951abfb'
+ARG version='4.5.1+210420'
+ARG sha256_checksum='e26c95db575897f65c6906993ce9d8eb7cfea9e76f40700fbe708bf24a3a07d3'
 
 # 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"]

4.0/fpm-alpine/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.27+201116'
-ARG sha256_checksum='11273c6feaa3beca6f63f8c3c79b1cba56f2271d87ca0bf249e1ece2e951abfb'
+ARG version='4.5.1+210420'
+ARG sha256_checksum='e26c95db575897f65c6906993ce9d8eb7cfea9e76f40700fbe708bf24a3a07d3'
 
 # 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"]

4.0/fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.27+201116'
-ARG sha256_checksum='11273c6feaa3beca6f63f8c3c79b1cba56f2271d87ca0bf249e1ece2e951abfb'
+ARG version='4.5.1+210420'
+ARG sha256_checksum='e26c95db575897f65c6906993ce9d8eb7cfea9e76f40700fbe708bf24a3a07d3'
 
 # 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"]

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/martialblog/docker-limesurvey.svg?branch=master)](https://travis-ci.org/martialblog/docker-limesurvey)
+[![Build Status](https://travis-ci.com/martialblog/docker-limesurvey.svg?branch=master)](https://travis-ci.com/martialblog/docker-limesurvey)
 [![](https://images.microbadger.com/badges/image/martialblog/limesurvey.svg)](https://microbadger.com/images/martialblog/limesurvey "Get your own image badge on microbadger.com")
 
 # LimeSurvey Docker

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:

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:

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"]