Upgrading to LTS Version 3.25.1+201124

Merge pull request #46 from MarkErik/remove-unused-security-LS3
Remove unused references to encryption for LS3 entrypoints
2025-12-06 16:39:11 +01:00 · 2020-12-01 07:23:19 +01:00 · 2020-12-01 07:21:56 +01:00 · 2020-11-29 19:58:26 -05:00 · 2020-11-24 08:08:36 +01:00 · 2020-11-24 08:07:40 +01:00
9 changed files with 12 additions and 87 deletions
--- 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.24.6+201109'
-ARG sha256_checksum='3e505ed3edc60011583bf373f4fefe87ecefc882e062805efe4156821d0bbae1'
+ARG version='3.25.1+201124'
+ARG sha256_checksum='a735501e282ea4a98a0b68044c2de11f300b796c74e3a36900c23d86aaad24fb'

 # Install OS dependencies
 RUN set -ex; \
--- 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,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.24.6+201109'
-ARG sha256_checksum='3e505ed3edc60011583bf373f4fefe87ecefc882e062805efe4156821d0bbae1'
+ARG version='3.25.1+201124'
+ARG sha256_checksum='a735501e282ea4a98a0b68044c2de11f300b796c74e3a36900c23d86aaad24fb'

 # Install OS dependencies
 RUN set -ex; \
--- 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.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.24.6+201109'
-ARG sha256_checksum='3e505ed3edc60011583bf373f4fefe87ecefc882e062805efe4156821d0bbae1'
+ARG version='3.25.1+201124'
+ARG sha256_checksum='a735501e282ea4a98a0b68044c2de11f300b796c74e3a36900c23d86aaad24fb'

 # Install OS dependencies
 RUN set -ex; \
--- 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.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.3.26+201110'
-ARG sha256_checksum='80d7141f30fcc5bdfef5d79552c42c9a0881db1af82946cb4226c7f4ac302e10'
+ARG version='4.3.27+201116'
+ARG sha256_checksum='11273c6feaa3beca6f63f8c3c79b1cba56f2271d87ca0bf249e1ece2e951abfb'

 # Install OS dependencies
 RUN set -ex; \
--- 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.3.26+201110'
-ARG sha256_checksum='80d7141f30fcc5bdfef5d79552c42c9a0881db1af82946cb4226c7f4ac302e10'
+ARG version='4.3.27+201116'
+ARG sha256_checksum='11273c6feaa3beca6f63f8c3c79b1cba56f2271d87ca0bf249e1ece2e951abfb'

 # Install OS dependencies
 RUN set -ex; \
--- 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.3.26+201110'
-ARG sha256_checksum='80d7141f30fcc5bdfef5d79552c42c9a0881db1af82946cb4226c7f4ac302e10'
+ARG version='4.3.27+201116'
+ARG sha256_checksum='11273c6feaa3beca6f63f8c3c79b1cba56f2271d87ca0bf249e1ece2e951abfb'

 # Install OS dependencies
 RUN set -ex; \
Author	SHA1	Message	Date
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