Upgrading to Version 5.2.0+211110

Upgrading to LTS Version 3.27.23+211102
Update entrypoint to enable an empty table prefix (#100 )
2025-12-06 16:39:11 +01:00 · 2021-11-12 08:04:59 +01:00 · 2021-11-12 08:03:42 +01:00 · 2021-11-08 20:38:35 +01:00 · 2021-11-04 07:58:35 +01:00 · 2021-11-04 07:57:54 +01:00
20 changed files with 50 additions and 55 deletions
--- a/.github/workflows/test-latest-container-images.yaml
+++ b/.github/workflows/test-latest-container-images.yaml
@@ -32,21 +32,3 @@ jobs:
        with:
          image: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
          config: tests/${{ matrix.context }}-tests.yaml
-
-      - name: 'Run vulnerability scanner'
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          exit-code: '0'
-          # Since we are not in charge of the Application
-          vuln-type: 'os'
-          output: trivy-results-5-${{ matrix.context }}.sarif
-          severity: 'CRITICAL,HIGH'
-
-      - name: 'Upload Trivy scan results to GitHub'
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: trivy-results-5-${{ matrix.context }}.sarif
-          category: "${{ matrix.context }}"
--- a/.github/workflows/test-lts-container-images.yaml
+++ b/.github/workflows/test-lts-container-images.yaml
@@ -32,21 +32,3 @@ jobs:
        with:
          image: docker.io/martialblog/limesurvey:3-${{ matrix.context }}
          config: tests/${{ matrix.context }}-tests.yaml
-
-      - name: 'Run vulnerability scanner'
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: docker.io/martialblog/limesurvey:3-${{ matrix.context }}
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          exit-code: '0'
-          # Since we are not in charge of the Application
-          vuln-type: 'os'
-          output: trivy-results-3-${{ matrix.context }}.sarif
-          severity: 'CRITICAL,HIGH'
-
-      - name: 'Upload Trivy scan results to GitHub'
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: trivy-results-3-${{ matrix.context }}.sarif
-          category: "${{ matrix.context }}"
--- 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.27.15+210907'
-ARG sha256_checksum='fca73470b50e6a61c7d5703c002ef3d46c863a039a136e2494bdd5a1fa111e87'
+ARG version='3.27.23+211102'
+ARG sha256_checksum='9544dbd18ee66256c1ef1f8047d7d6ffcc70c791f7c040045d6ea65963a45a84'
 ARG USER=root
 ARG LISTEN_PORT=80

--- a/3.0/apache/entrypoint.sh
+++ b/3.0/apache/entrypoint.sh
@@ -89,7 +89,7 @@ return array(
      'username' => '$DB_USERNAME',
      'password' => '$DB_PASSWORD',
      'charset' => '$DB_CHARSET',
-      'tablePrefix' => '$DB_TABLE_PREFIX',
+      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
    ),
    //'session' => array (
    //   'class' => 'application.core.web.DbHttpSession',
--- 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.27.15+210907'
-ARG sha256_checksum='fca73470b50e6a61c7d5703c002ef3d46c863a039a136e2494bdd5a1fa111e87'
+ARG version='3.27.23+211102'
+ARG sha256_checksum='9544dbd18ee66256c1ef1f8047d7d6ffcc70c791f7c040045d6ea65963a45a84'

 # Install OS dependencies
 RUN set -ex; \
--- a/3.0/fpm-alpine/entrypoint.sh
+++ b/3.0/fpm-alpine/entrypoint.sh
@@ -82,7 +82,7 @@ return array(
      'username' => '$DB_USERNAME',
      'password' => '$DB_PASSWORD',
      'charset' => '$DB_CHARSET',
-      'tablePrefix' => '$DB_TABLE_PREFIX',
+      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
    ),
    //'session' => array (
    //   'class' => 'application.core.web.DbHttpSession',
--- 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.27.15+210907'
-ARG sha256_checksum='fca73470b50e6a61c7d5703c002ef3d46c863a039a136e2494bdd5a1fa111e87'
+ARG version='3.27.23+211102'
+ARG sha256_checksum='9544dbd18ee66256c1ef1f8047d7d6ffcc70c791f7c040045d6ea65963a45a84'

 # Install OS dependencies
 RUN set -ex; \
--- a/3.0/fpm/entrypoint.sh
+++ b/3.0/fpm/entrypoint.sh
@@ -82,7 +82,7 @@ return array(
      'username' => '$DB_USERNAME',
      'password' => '$DB_PASSWORD',
      'charset' => '$DB_CHARSET',
-      'tablePrefix' => '$DB_TABLE_PREFIX',
+      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
    ),
    //'session' => array (
    //   'class' => 'application.core.web.DbHttpSession',
--- a/4.0/apache/entrypoint.sh
+++ b/4.0/apache/entrypoint.sh
@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
+DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}

 ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
 ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -106,6 +107,7 @@ return array(
    'publicurl'=>'$PUBLIC_URL',
    'debug'=>$DEBUG,
    'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
  )
 );

--- a/4.0/fpm-alpine/entrypoint.sh
+++ b/4.0/fpm-alpine/entrypoint.sh
@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
+DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}

 ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
 ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -99,6 +100,7 @@ return array(
    'publicurl'=>'$PUBLIC_URL',
    'debug'=>$DEBUG,
    'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
  )
 );

--- a/4.0/fpm/entrypoint.sh
+++ b/4.0/fpm/entrypoint.sh
@@ -10,6 +10,7 @@ DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
+DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}

 ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
 ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
@@ -99,6 +100,7 @@ return array(
    'publicurl'=>'$PUBLIC_URL',
    'debug'=>$DEBUG,
    'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
  )
 );

--- a/5.0/apache/Dockerfile
+++ b/5.0/apache/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.1.7+210908'
-ARG sha256_checksum='01dad29df3a51adce6cd60c34d3573348f99877b2eeaaa06a7dc57d62fe6da30'
+ARG version='5.2.0+211110'
+ARG sha256_checksum='4f1299a463d72c6eb8d7acf8fbadecd867cf78c13075bafc2524e1842a661a83'
 ARG USER=www-data
 ARG LISTEN_PORT=8080

--- a/5.0/apache/entrypoint.sh
+++ b/5.0/apache/entrypoint.sh
@@ -10,10 +10,13 @@ DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
+DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}

 ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
 ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
 ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}

 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
@@ -93,7 +96,7 @@ return array(
      'username' => '$DB_USERNAME',
      'password' => '$DB_PASSWORD',
      'charset' => '$DB_CHARSET',
-      'tablePrefix' => '$DB_TABLE_PREFIX',
+      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
    ),
    //'session' => array (
    //   'class' => 'application.core.web.DbHttpSession',
@@ -113,6 +116,7 @@ return array(
    'publicurl'=>'$PUBLIC_URL',
    'debug'=>$DEBUG,
    'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
  )
 );

@@ -140,6 +144,8 @@ else
 \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
 \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
 \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
+\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
+\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
 return \$config;
 EOF
    else
--- a/5.0/fpm-alpine/Dockerfile
+++ b/5.0/fpm-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.1.7+210908'
-ARG sha256_checksum='01dad29df3a51adce6cd60c34d3573348f99877b2eeaaa06a7dc57d62fe6da30'
+ARG version='5.2.0+211110'
+ARG sha256_checksum='4f1299a463d72c6eb8d7acf8fbadecd867cf78c13075bafc2524e1842a661a83'
 ARG USER=www-data

 # Install OS dependencies
--- a/5.0/fpm-alpine/entrypoint.sh
+++ b/5.0/fpm-alpine/entrypoint.sh
@@ -10,10 +10,13 @@ DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
+DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}

 ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
 ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
 ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}

 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
@@ -86,7 +89,7 @@ return array(
      'username' => '$DB_USERNAME',
      'password' => '$DB_PASSWORD',
      'charset' => '$DB_CHARSET',
-      'tablePrefix' => '$DB_TABLE_PREFIX',
+      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
    ),
    //'session' => array (
    //   'class' => 'application.core.web.DbHttpSession',
@@ -106,6 +109,7 @@ return array(
    'publicurl'=>'$PUBLIC_URL',
    'debug'=>$DEBUG,
    'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
  )
 );

@@ -133,6 +137,8 @@ else
 \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
 \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
 \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
+\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
+\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
 return \$config;
 EOF
    else
--- a/5.0/fpm/Dockerfile
+++ b/5.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.1.7+210908'
-ARG sha256_checksum='01dad29df3a51adce6cd60c34d3573348f99877b2eeaaa06a7dc57d62fe6da30'
+ARG version='5.2.0+211110'
+ARG sha256_checksum='4f1299a463d72c6eb8d7acf8fbadecd867cf78c13075bafc2524e1842a661a83'
 ARG USER=www-data

 # Install OS dependencies
--- a/5.0/fpm/entrypoint.sh
+++ b/5.0/fpm/entrypoint.sh
@@ -10,10 +10,13 @@ DB_NAME=${DB_NAME:-'limesurvey'}
 DB_TABLE_PREFIX=${DB_TABLE_PREFIX:-'lime_'}
 DB_USERNAME=${DB_USERNAME:-'limesurvey'}
 DB_PASSWORD=${DB_PASSWORD:-}
+DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'}

 ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-}
 ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-}
 ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-}
+ENCRYPT_NONCE=${ENCRYPT_NONCE:-}
+ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-}

 ADMIN_USER=${ADMIN_USER:-'admin'}
 ADMIN_NAME=${ADMIN_NAME:-'admin'}
@@ -86,7 +89,7 @@ return array(
      'username' => '$DB_USERNAME',
      'password' => '$DB_PASSWORD',
      'charset' => '$DB_CHARSET',
-      'tablePrefix' => '$DB_TABLE_PREFIX',
+      'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
    ),
    //'session' => array (
    //   'class' => 'application.core.web.DbHttpSession',
@@ -106,6 +109,7 @@ return array(
    'publicurl'=>'$PUBLIC_URL',
    'debug'=>$DEBUG,
    'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
  )
 );

@@ -133,6 +137,8 @@ else
 \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR';
 \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY';
 \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY';
+\$config['encryptionnonce'] = '$ENCRYPT_NONCE';
+\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY';
 return \$config;
 EOF
    else
--- a/README.md
+++ b/README.md
@@ -103,7 +103,8 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 | DB_PORT         | Database server port                      |
 | DB_SOCK         | Database unix socket instead of host/port |
 | DB_NAME         | Database name                             |
-| DB_TABLE_PREFIX | Database table prefix                     |
+| DB_TABLE_PREFIX | Database table prefix; set this to a single whitespace if you don't want a table prefix. |
+| DB_MYSQL_ENGINE | MySQL engine used for survey tables (values: MyISAM, InnoDB, default: MyISAM)       |
 | DB_USERNAME     | Database user                             |
 | DB_PASSWORD     | Database user's password                  |
 | ADMIN_USER      | Initial LimeSurvey Admin User             |
@@ -120,6 +121,8 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 | ENCRYPT_KEYPAIR  | Data encryption keypair                  |
 | ENCRYPT_PUBLIC_KEY | Data encryption public key             |
 | ENCRYPT_SECRET_KEY | Data encryption secret key             |
+| ENCRYPT_NONCE      | Data encryption nonce (used in 5.0)    |
+| ENCRYPT_SECRET_BOX_KEY | Data encryption secret box key (used in 5.0)             |
 | LISTEN_PORT     | Apache: Listen port. Default: 8080        |

 For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
--- a/docker-compose.pgsql.yml
+++ b/docker-compose.pgsql.yml
@@ -2,6 +2,7 @@ version: "3.0"
 services:
  limesurvey:
    build:
+      # Hint: Change it to 3.0/apache/ if you want to use LimeSurvey 3.*
      context: 5.0/apache/
      dockerfile: Dockerfile
    volumes:
@@ -12,6 +13,7 @@ services:
    depends_on:
      - lime-db
    ports:
+      # Hint: Change it to 80:8080 if you are using LimeSurvey 3.*
      - "8080:8080"
    environment:
      - "DB_TYPE=pgsql"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,8 @@ services:
      - "DB_HOST=lime-db"
      - "DB_PASSWORD=secret"
      - "ADMIN_PASSWORD=foobar"
+      # If you require an empty table prefix, use a space as the DB_TABLE_PREFIX
+      # - "DB_TABLE_PREFIX= "
  lime-db:
    image: mysql:5.7
    environment:
Author	SHA1	Message	Date
Markus Opolka	5d9c116b64	Upgrading to Version 5.2.0+211110	2021-11-12 08:04:59 +01:00
Markus Opolka	4b02c3c26d	Upgrading to LTS Version 3.27.23+211102	2021-11-12 08:03:42 +01:00
Markus Opolka	1676677dfc	Update entrypoint to enable an empty table prefix (#100 ) Update entrypoint to enable an empty table prefix - Who are we to dictate a table prefix - Makes it easier to migrate existing databases that don't have a prefix	2021-11-08 20:38:35 +01:00
Markus Opolka	681f421d6f	Upgrading to Version 5.1.17+211025	2021-11-04 07:58:35 +01:00
Markus Opolka	baab608bd9	Upgrading to LTS Version 3.27.22+211026	2021-11-04 07:57:54 +01:00
Markus Opolka	7e1fa3eedd	Upgrading to Version 5.1.16+211020	2021-10-25 11:05:13 +02:00
Markus Opolka	5a401f33f7	Upgrading to LTS Version 3.27.21+211021	2021-10-25 11:04:21 +02:00
Alex Sears	c3a3e77b76	Add encryption nonce and secret box key to 5.0 images (#99 ) Add encryption nonce and secret box key to 5.0 images Signed-off-by: Alex Sears <me@alexsears.com>	2021-10-25 08:52:32 +02:00
Markus Opolka	d6af8e0a03	Remove trivy scan (#97 ) - It's too verbose and we currently don't have time to review everyting	2021-10-18 09:47:55 +02:00
Markus Opolka	633893f9a8	Upgrading to Version 5.1.14+210927	2021-10-13 19:04:47 +02:00
Markus Opolka	3cc111f903	Upgrading to LTS Version 3.27.19+210928	2021-10-13 19:03:52 +02:00
Alex Sears	0d572c645c	Update entrypoint to allow customization of MySQL engine (#96 ) * Update entrypoint to allow customization of MySQL engine * Update fpm images to customize MySQL engine * Update README for MySQL engine values and default	2021-10-13 11:37:05 +02:00
Markus Opolka	bca073774f	Upgrading to Version 5.1.13+210923	2021-09-28 08:33:24 +02:00
Markus Opolka	e580c1ef45	Upgrading to LTS Version 3.27.18+210921	2021-09-28 08:32:11 +02:00
Markus Opolka	abe42af3e2	Upgrading to Version 5.1.11+210920	2021-09-21 07:59:13 +02:00
Markus Opolka	8a8a8db556	Upgrading to LTS Version 3.27.17+210911	2021-09-21 07:58:39 +02:00
Lucas Benevides	7e3a9ad099	Include Hints to use in limesurvey 3. (#90 ) This makes more clear for those who want to use the LTS version of limesurvey, that some adaptations are needed.	2021-09-15 14:04:21 +02:00
Markus Opolka	a57da625d7	Upgrading to Version 5.1.9+210912	2021-09-10 09:50:37 +02:00
Markus Opolka	87da3cea63	Upgrading to LTS Version 3.27.16+210909	2021-09-10 09:49:45 +02:00