Upgrading to Version 4.4.2+210208

Upgrading to LTS Version 3.25.10+210128
Upgrading to Version 4.4.0+210129
2025-12-06 16:39:11 +01:00 · 2021-02-09 09:40:45 +01:00 · 2021-02-09 09:38:44 +01:00 · 2021-02-02 07:52:34 +01:00 · 2021-01-29 07:22:49 +01:00 · 2021-01-29 07:21:54 +01:00
10 changed files with 37 additions and 100 deletions
--- a/3.0/apache/Dockerfile
+++ b/3.0/apache/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:7.2-apache
+FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.24.3+201027'
-ARG sha256_checksum='f2072e3b8f5789df7b4e625573f785d5d0a7b8ebc217757fafc194606ebfd6d3'
+ARG version='3.25.10+210128'
+ARG sha256_checksum='6f27b8566a8afe49db57514a84c6dc9ee98ffc07769a2b51d3682e48f1a4af88'

 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
        libldap2-dev \
        libfreetype6-dev \
        libjpeg-dev \
+        libonig-dev \
        zlib1g-dev \
        libc-client-dev \
        libkrb5-dev \
        libpng-dev \
        libpq-dev \
+        libzip-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,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 gd && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
--- a/3.0/apache/entrypoint.sh
+++ b/3.0/apache/entrypoint.sh
@@ -11,10 +11,6 @@ DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}

-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
-
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
@@ -106,27 +102,6 @@ EOF

 fi

-# Check if security config already provisioned
-if [ -f application/config/security.php ]; then
-    echo 'Info: security.php already provisioned'
-else
-    echo 'Info: Creating security.php'
-    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
-
-        cat <<EOF > application/config/security.php
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-\$config = array();
-\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
-\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
-\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-return \$config;
-EOF
-    else
-        echo >&2 'Warning: No encryption keys were provided'
-        echo >&2 'Warning: A security.php config will be created by the application'
-        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
-    fi
-fi

 # Check if LimeSurvey database is provisioned
 echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
--- a/3.0/fpm-alpine/Dockerfile
+++ b/3.0/fpm-alpine/Dockerfile
@@ -1,22 +1,24 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.24.3+201027'
-ARG sha256_checksum='f2072e3b8f5789df7b4e625573f785d5d0a7b8ebc217757fafc194606ebfd6d3'
+ARG version='3.25.10+210128'
+ARG sha256_checksum='6f27b8566a8afe49db57514a84c6dc9ee98ffc07769a2b51d3682e48f1a4af88'

 # Install OS dependencies
 RUN set -ex; \
        apk add --no-cache --virtual .build-deps \
        freetype-dev \
        libpng-dev \
+        libzip-dev \
        libjpeg-turbo-dev \
        openldap-dev \
+        oniguruma-dev \
        imap-dev \
        postgresql-dev && \
        apk add --no-cache netcat-openbsd bash

 # 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 gd && \
        docker-php-ext-configure imap --with-imap-ssl && \
        docker-php-ext-install \
        gd \
--- a/3.0/fpm-alpine/entrypoint.sh
+++ b/3.0/fpm-alpine/entrypoint.sh
@@ -11,10 +11,6 @@ DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}

-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
-
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
@@ -106,27 +102,6 @@ EOF

 fi

-# Check if security config already provisioned
-if [ -f application/config/security.php ]; then
-    echo 'Info: security.php already provisioned'
-else
-    echo 'Info: Creating security.php'
-    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
-
-        cat <<EOF > application/config/security.php
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-\$config = array();
-\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
-\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
-\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-return \$config;
-EOF
-    else
-        echo >&2 'Warning: No encryption keys were provided'
-        echo >&2 'Warning: A security.php config will be created by the application'
-        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
-    fi
-fi

 # Check if LimeSurvey database is provisioned
 echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
--- a/3.0/fpm/Dockerfile
+++ b/3.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.24.3+201027'
-ARG sha256_checksum='f2072e3b8f5789df7b4e625573f785d5d0a7b8ebc217757fafc194606ebfd6d3'
+ARG version='3.25.10+210128'
+ARG sha256_checksum='6f27b8566a8afe49db57514a84c6dc9ee98ffc07769a2b51d3682e48f1a4af88'

 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
        libldap2-dev \
        libfreetype6-dev \
        libjpeg-dev \
+        libonig-dev \
        zlib1g-dev \
        libc-client-dev \
        libkrb5-dev \
        libpng-dev \
        libpq-dev \
+        libzip-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,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 gd && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
--- a/3.0/fpm/entrypoint.sh
+++ b/3.0/fpm/entrypoint.sh
@@ -11,10 +11,6 @@ DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}

-ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
-ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
-ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
-
 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
 ADMIN_EMAIL=${ADMIN_EMAIL:-'foobar@example.com'}
@@ -106,27 +102,6 @@ EOF

 fi

-# Check if security config already provisioned
-if [ -f application/config/security.php ]; then
-    echo 'Info: security.php already provisioned'
-else
-    echo 'Info: Creating security.php'
-    if [ ! -z "$ENCRYPT_KEYPAIR" ]; then
-
-        cat <<EOF > application/config/security.php
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
-\$config = array();
-\$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
-\$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
-\$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
-return \$config;
-EOF
-    else
-        echo >&2 'Warning: No encryption keys were provided'
-        echo >&2 'Warning: A security.php config will be created by the application'
-        echo >&2 'Warning: THIS FILE NEEDS TO BE PERSISTENT'
-    fi
-fi

 # Check if LimeSurvey database is provisioned
 echo 'Info: Check if database already provisioned. Nevermind the Stack trace.'
--- a/4.0/apache/Dockerfile
+++ b/4.0/apache/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:7.2-apache
+FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.23+201026'
-ARG sha256_checksum='c78c0d821b1be9f522da3d6fda13910db27efb4bf32fc903b7986bbd7e39a312'
+ARG version='4.4.2+210208'
+ARG sha256_checksum='6bb541d5da9c1a3bcc53284512f7bebadbbe7a966f7fb0b07d9b48cd55111483'

 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
        libldap2-dev \
        libfreetype6-dev \
        libjpeg-dev \
+        libonig-dev \
        zlib1g-dev \
        libc-client-dev \
        libkrb5-dev \
        libpng-dev \
        libpq-dev \
+        libzip-dev \
        netcat \
        curl \
        \
@@ -29,7 +31,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 gd && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
--- a/4.0/fpm-alpine/Dockerfile
+++ b/4.0/fpm-alpine/Dockerfile
@@ -1,22 +1,24 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.23+201026'
-ARG sha256_checksum='c78c0d821b1be9f522da3d6fda13910db27efb4bf32fc903b7986bbd7e39a312'
+ARG version='4.4.2+210208'
+ARG sha256_checksum='6bb541d5da9c1a3bcc53284512f7bebadbbe7a966f7fb0b07d9b48cd55111483'

 # Install OS dependencies
 RUN set -ex; \
        apk add --no-cache --virtual .build-deps \
        freetype-dev \
        libpng-dev \
+        libzip-dev \
        libjpeg-turbo-dev \
        openldap-dev \
+        oniguruma-dev \
        imap-dev \
        postgresql-dev && \
        apk add --no-cache netcat-openbsd bash

 # 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 gd && \
        docker-php-ext-configure imap --with-imap-ssl && \
        docker-php-ext-install \
        exif \
--- a/4.0/fpm/Dockerfile
+++ b/4.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.23+201026'
-ARG sha256_checksum='c78c0d821b1be9f522da3d6fda13910db27efb4bf32fc903b7986bbd7e39a312'
+ARG version='4.4.2+210208'
+ARG sha256_checksum='6bb541d5da9c1a3bcc53284512f7bebadbbe7a966f7fb0b07d9b48cd55111483'

 # Install OS dependencies
 RUN set -ex; \
@@ -12,11 +12,13 @@ RUN set -ex; \
        libldap2-dev \
        libfreetype6-dev \
        libjpeg-dev \
+        libonig-dev \
        zlib1g-dev \
        libc-client-dev \
        libkrb5-dev \
        libpng-dev \
        libpq-dev \
+        libzip-dev \
        netcat \
        \
        && apt-get -y autoclean; apt-get -y autoremove; \
@@ -28,7 +30,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 gd && \
        docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
        docker-php-ext-install -j5 \
        exif \
--- a/README.md
+++ b/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
Author	SHA1	Message	Date
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
Markus Opolka	15f46a40b9	Upgrading to Version 4.3.30+201207	2020-12-14 17:47:06 +01:00
Markus Opolka	f7f8bbcbae	Upgrading to LTS Version 3.25.3+201208	2020-12-14 17:46:21 +01:00
Markus Opolka	0f7d4ef58f	Upgrading to Version 4.3.29+201130	2020-12-07 18:29:05 +01:00
Markus Opolka	54e0eea7ff	Upgrading to LTS Version 3.25.2+201131	2020-12-07 18:27:44 +01:00
Markus Opolka	fb10ebaa8f	Update README	2020-12-03 14:52:16 +01:00
Markus Opolka	2750dbecb0	Upgrading to Version 4.3.28+201123	2020-12-01 07:24:30 +01:00
Markus Opolka	3e4bdaf2ef	Upgrading to LTS Version 3.25.1+201124	2020-12-01 07:23:19 +01:00
Markus Opolka	909d240306	Merge pull request #46 from MarkErik/remove-unused-security-LS3 Remove unused references to encryption for LS3 entrypoints	2020-12-01 07:21:56 +01:00
Mark	7f8ae6921a	Remove unused references to encryption for LS3 entrypoints Limesurvey 3.0 won't support the encyption introduced in LS4, so the variables and the check for security.php isn't necessary in the entrypoint.sh files.	2020-11-29 19:58:26 -05:00
Markus Opolka	17b72df441	Upgrading to Version 4.3.27+201116	2020-11-24 08:08:36 +01:00
Markus Opolka	0c90ce2487	Upgrading to LTS Version 3.25.0+201117	2020-11-24 08:07:40 +01:00
Markus Opolka	4b12d8a53c	Upgrading to Version 4.3.26+201110	2020-11-16 10:40:22 +01:00
Markus Opolka	c90840d414	Upgrading to LTS Version 3.24.6+201109	2020-11-16 10:39:33 +01:00
Markus Opolka	89f15d94ba	Upgrading to Version 4.3.25+201105	2020-11-10 07:37:10 +01:00
Markus Opolka	ab6da243fe	Upgrading to LTS Version 3.24.5+201104	2020-11-10 07:35:55 +01:00
Markus Opolka	ce54275ddd	Upgrading to Version 4.3.24+201102	2020-11-05 07:27:51 +01:00
Markus Opolka	b0b38440e4	Upgrading to LTS Version 3.24.4+201103	2020-11-05 07:26:37 +01:00
Markus Opolka	56b9a7e686	Merge pull request #44 from martialblog/php-upgrade Update Base Images to PHP 7.4	2020-11-03 11:29:55 +01:00
Markus Opolka	41a275a59d	Update Base Images to PHP 7.4	2020-11-03 10:43:39 +01:00