Upgrading to Version 4.3.29+201130

Upgrading to LTS Version 3.25.2+201131
Update README
2025-12-06 16:39:11 +01:00 · 2020-12-07 18:29:05 +01:00 · 2020-12-07 18:27:44 +01:00 · 2020-12-03 14:52:16 +01:00 · 2020-12-01 07:24:30 +01:00 · 2020-12-01 07:23:19 +01:00
16 changed files with 44 additions and 105 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.0+201013'
-ARG sha256_checksum='5f38ea92379534fdc8b18161736e04b785115a54d3c373c5af47d6c27b37c75a'
+ARG version='3.25.2+201131'
+ARG sha256_checksum='1539f51195175b93f80e592dba206d057538d0e36038f3fc3349f79a157097a3'

 # 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.0+201013'
-ARG sha256_checksum='5f38ea92379534fdc8b18161736e04b785115a54d3c373c5af47d6c27b37c75a'
+ARG version='3.25.2+201131'
+ARG sha256_checksum='1539f51195175b93f80e592dba206d057538d0e36038f3fc3349f79a157097a3'

 # 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.0+201013'
-ARG sha256_checksum='5f38ea92379534fdc8b18161736e04b785115a54d3c373c5af47d6c27b37c75a'
+ARG version='3.25.2+201131'
+ARG sha256_checksum='1539f51195175b93f80e592dba206d057538d0e36038f3fc3349f79a157097a3'

 # 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.19+201005'
-ARG sha256_checksum='ef9f8c14e818da33de395c1c80572f943e843c9120efc447b4a24a67d62d5682'
+ARG version='4.3.29+201130'
+ARG sha256_checksum='a80d406efc35634adc34b1811a26079a6d00ae271f8721825ae9c72bf26de820'

 # 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.19+201005'
-ARG sha256_checksum='ef9f8c14e818da33de395c1c80572f943e843c9120efc447b4a24a67d62d5682'
+ARG version='4.3.29+201130'
+ARG sha256_checksum='a80d406efc35634adc34b1811a26079a6d00ae271f8721825ae9c72bf26de820'

 # 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.19+201005'
-ARG sha256_checksum='ef9f8c14e818da33de395c1c80572f943e843c9120efc447b4a24a67d62d5682'
+ARG version='4.3.29+201130'
+ARG sha256_checksum='a80d406efc35634adc34b1811a26079a6d00ae271f8721825ae9c72bf26de820'

 # 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
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -6,7 +6,7 @@ services:
    environment:
      - DB_TYPE=pgsql
      - DB_PORT=5432
-      - DB_HOST=limesurvey_db_1.limesurvey_default
+      - DB_HOST=db
      - DB_PASSWORD=example
      - DB_NAME=limesurvey
      - DB_USERNAME=limesurvey
--- a/docker-compose.fpm.alpine.yml
+++ b/docker-compose.fpm.alpine.yml
@@ -12,7 +12,7 @@ services:
    depends_on:
      - lime-db
    environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
  lime-web:
--- a/docker-compose.fpm.yml
+++ b/docker-compose.fpm.yml
@@ -12,7 +12,7 @@ services:
    depends_on:
      - lime-db
    environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
  lime-web:
--- a/docker-compose.pgsql.yml
+++ b/docker-compose.pgsql.yml
@@ -15,7 +15,7 @@ services:
    environment:
      - "DB_TYPE=pgsql"
      - "DB_PORT=5432"
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
  lime-db:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
    ports:
      - "8080:80"
    environment:
-      - "DB_HOST=docker-limesurvey_lime-db_1"
+      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
  lime-db:
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -31,3 +31,5 @@ sed -r -i -e "s/[0-9]+(\.[0-9]+)+\+[0-9]+/$NEW_VERSION/" $MAJOR_VERSION/apache/D
 sed -r -i -e "s/[A-Fa-f0-9]{64}/$SHA256_CHECKSUM/" $MAJOR_VERSION/apache/Dockerfile $MAJOR_VERSION/fpm/Dockerfile $MAJOR_VERSION/fpm-alpine/Dockerfile

 # After that, check and commit
+echo "git add 3.0 ; git commit -m 'Upgrading to LTS Version ${NEW_VERSION}' && git tag ${NEW_VERSION}"
+echo "git add 4.0 ; git commit -m 'Upgrading to Version ${NEW_VERSION}' && git tag ${NEW_VERSION}"
Author	SHA1	Message	Date
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
Markus Opolka	876145e009	Upgrading to Version 4.3.23+201026	2020-11-03 07:55:44 +01:00
Markus Opolka	4a9a8a9bc3	Upgrading to LTS Version 3.24.3+201027	2020-11-03 07:54:18 +01:00
Markus Opolka	a189f5eceb	Merge pull request #42 from jwhb/compose-services Simplify database host values with compose	2020-11-02 08:29:42 +01:00
jwhb	0c7e8947ca	Simplify database host values with compose	2020-10-31 16:07:59 +01:00
Markus Opolka	7912d765ad	Upgrading to Version 4.3.22+201019	2020-10-26 14:54:48 +01:00
Markus Opolka	245cd092ed	Upgrading to LTS Version 3.24.2+201020	2020-10-26 14:53:07 +01:00
Markus Opolka	c897f9efbe	Upgrading to Version 4.3.21+201015	2020-10-19 10:40:34 +02:00
Markus Opolka	ffe21eb987	Upgrading to LTS Version 3.24.1+201014	2020-10-19 10:39:39 +02:00
Markus Opolka	e4c997f148	Extend upgrade script - now shows commit message template	2020-10-19 10:39:18 +02:00
Markus Opolka	ebfbaeb119	Upgrading to Version 4.3.20+201012	2020-10-14 18:17:53 +02:00