Upgrading to Version 3.17.10+190821

Fix gd library configuration and update example docker-compose files

README.md

@@ -29,7 +29,9 @@ LimeSurvey requires an external database (MySQL, PostgreSQL) to run. See *docker
 
 To preserve the uploaded files assign the upload folder into a volume. See *docker-compose.yml* for example.
 
-Path: */var/www/html/upload/*
+Path: */var/www/html/upload/surveys*
+
+**Hint**: The mounted directory must be owned by the webserver user (e.g. www-data)
 
 # LimeSurvey Configuration
 
@@ -62,6 +64,20 @@ To change to LimeSurvey configuration, you can mount a Volume into the Container
 
 For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
 
+# Running this image 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.
+
+```
+docker-compose up
+
+# Frontend
+http://localhost:8080/
+
+# Backend
+http://localhost:8080/index.php/admin
+```
+
 # References
 
 - https://www.limesurvey.org/

apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.2-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.15.9+190214'
-ARG sha256_checksum='cf3c49425119f627e92a69d43f9d869fdb1c56d6b152adb7853e6b138edd1eed'
+ARG version='3.17.10+190821'
+ARG sha256_checksum='08d6f04cc5b2b03c4b0664e88671002ba9478ee2c477ec5d0f00e1640cddb9eb'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -10,6 +10,8 @@ RUN set -ex; \
         apt-get install --no-install-recommends -y \
         \
         libldap2-dev \
+        libfreetype6-dev \
+        libjpeg-dev \
         zlib1g-dev \
         libc-client-dev \
         libkrb5-dev \
@@ -17,7 +19,7 @@ RUN set -ex; \
         libpq-dev \
         netcat \
         \
-        && apt-get autoclean; apt-get autoremove; \
+        && apt-get -y autoclean; apt-get -y autoremove; \
         rm -rf /var/lib/apt/lists/*
 
 # Link LDAP library for PHP ldap extension
@@ -26,6 +28,7 @@ RUN set -ex; \
 
 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
+        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         gd \
@@ -57,7 +60,7 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
 
 RUN set -ex; \
-        echo "${sha256_checksum} /tmp/${version}.tar.gz" | sha256sum -c - && \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
         rm -f "/tmp/${version}.tar.gz" && \

docker-compose.fpm.alpine.yml

@@ -5,7 +5,7 @@ services:
       context: fpm-alpine/
       dockerfile: Dockerfile
     volumes:
-      - /tmp/upload/:/var/www/html/upload/
+      - /tmp/upload/surveys:/var/www/html/upload/surveys
       - lime:/var/www/html
     links:
       - lime-db

docker-compose.fpm.yml

@@ -5,7 +5,7 @@ services:
       context: fpm/
       dockerfile: Dockerfile
     volumes:
-      - /tmp/upload/:/var/www/html/upload/
+      - /tmp/upload/surveys:/var/www/html/upload/surveys
       - lime:/var/www/html
     links:
       - lime-db

docker-compose.pgsql.yml

@@ -5,7 +5,7 @@ services:
       context: apache/
       dockerfile: Dockerfile
     volumes:
-      - /tmp/upload/:/var/www/html/upload/
+      - /tmp/upload/surveys:/var/www/html/upload/surveys
     links:
       - lime-db
     depends_on:

docker-compose.yml

@@ -5,7 +5,7 @@ services:
       context: apache/
       dockerfile: Dockerfile
     volumes:
-      - /tmp/upload/:/var/www/html/upload/
+      - /tmp/upload/surveys:/var/www/html/upload/surveys
     links:
       - lime-db
     depends_on:

fpm-alpine/Dockerfile

@@ -1,12 +1,14 @@
 FROM php:7.2-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.15.9+190214'
-ARG sha256_checksum='cf3c49425119f627e92a69d43f9d869fdb1c56d6b152adb7853e6b138edd1eed'
+ARG version='3.17.10+190821'
+ARG sha256_checksum='08d6f04cc5b2b03c4b0664e88671002ba9478ee2c477ec5d0f00e1640cddb9eb'
 
 # Install OS dependencies
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
+        freetype-dev \
         libpng-dev \
+        libjpeg-turbo-dev \
         openldap-dev \
         imap-dev \
         postgresql-dev && \
@@ -14,6 +16,7 @@ RUN set -ex; \
 
 # Install PHP Plugins
 RUN set -ex; \
+        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr ; \
         docker-php-ext-configure imap --with-imap-ssl && \
         docker-php-ext-install \
         gd \
@@ -30,7 +33,7 @@ RUN set -ex; \
 ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
 
 RUN set -ex; \
-        echo "${sha256_checksum} /tmp/${version}.tar.gz" | sha256sum -c - && \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
         \

fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.2-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.15.9+190214'
-ARG sha256_checksum='cf3c49425119f627e92a69d43f9d869fdb1c56d6b152adb7853e6b138edd1eed'
+ARG version='3.17.10+190821'
+ARG sha256_checksum='08d6f04cc5b2b03c4b0664e88671002ba9478ee2c477ec5d0f00e1640cddb9eb'
 
 # Install OS dependencies
 RUN set -ex; \
@@ -10,6 +10,8 @@ RUN set -ex; \
         apt-get install --no-install-recommends -y \
         \
         libldap2-dev \
+        libfreetype6-dev \
+        libjpeg-dev \
         zlib1g-dev \
         libc-client-dev \
         libkrb5-dev \
@@ -17,7 +19,7 @@ RUN set -ex; \
         libpq-dev \
         netcat \
         \
-        && apt-get autoclean; apt-get autoremove; \
+        && apt-get -y autoclean; apt-get -y autoremove; \
         rm -rf /var/lib/apt/lists/*
 
 # Link LDAP library for PHP ldap extension
@@ -26,6 +28,7 @@ RUN set -ex; \
 
 # Install PHP Plugins and Configure PHP imap plugin
 RUN set -ex; \
+        docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
         docker-php-ext-install -j5 \
         gd \
@@ -44,7 +47,7 @@ ENV LIMESURVEY_VERSION=$version
 ADD "https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz" /tmp
 
 RUN set -ex; \
-        echo "${sha256_checksum} /tmp/${version}.tar.gz" | sha256sum -c - && \
+        echo "${sha256_checksum}  /tmp/${version}.tar.gz" | sha256sum -c - && \
         \
         tar xzvf "/tmp/${version}.tar.gz" --strip-components=1 -C /var/www/html/ && \
         rm -f "/tmp/${version}.tar.gz" && \

makefile

@@ -0,0 +1,8 @@
+.PHONY: apache fpm fpm-alpine
+
+apache:
+	docker build --pull -t limesurvey:apache apache
+fpm-alpine:
+	docker build --pull -t limesurvey:fpm-alpine fpm-alpine
+fpm:
+	docker build --pull -t limesurvey:fpm fpm

upgrade.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 # Upgrade script
 
+set -x
+
 if [ $# -eq 0 ]
   then
       echo 'Pass new LimeSurvey Version tag:'
@@ -20,7 +22,8 @@ fi
 
 # Download, unzip and chmod LimeSurvey from official GitHub repository
 wget -P /tmp "https://github.com/LimeSurvey/LimeSurvey/archive/${NEW_VERSION}.tar.gz"
-SHA256_CHECKSUM=$(sha256 "${NEW_VERSION}.tar.gz")
+
+SHA256_CHECKSUM=$(sha256sum "/tmp/${NEW_VERSION}.tar.gz" | awk '{ print $1 }')
 
 # Update lines in the files
 sed -r -i -e "s/[0-9]+(\.[0-9]+)+\+[0-9]+/$NEW_VERSION/" apache/Dockerfile fpm/Dockerfile fpm-alpine/Dockerfile