Upgrading to LTS Version 3.27.21+211021

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>
2025-12-06 16:39:11 +01:00 · 2021-10-25 11:04:21 +02:00 · 2021-10-25 08:52:32 +02:00 · 2021-10-18 09:47:55 +02:00 · 2021-10-13 19:04:47 +02:00 · 2021-10-13 19:03:52 +02:00
15 changed files with 39 additions and 48 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.18+210921'
-ARG sha256_checksum='7ed144511d6d8bcfc99d9aff2d0c94bf27fbea302ee7d19a8de7aef09cb7245a'
+ARG version='3.27.21+211021'
+ARG sha256_checksum='c54bbc4116b595485f4292c0d0b218049f36b579deffae2a192e350cbe4170b6'
 ARG USER=root
 ARG LISTEN_PORT=80

--- 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.18+210921'
-ARG sha256_checksum='7ed144511d6d8bcfc99d9aff2d0c94bf27fbea302ee7d19a8de7aef09cb7245a'
+ARG version='3.27.21+211021'
+ARG sha256_checksum='c54bbc4116b595485f4292c0d0b218049f36b579deffae2a192e350cbe4170b6'

 # Install OS dependencies
 RUN set -ex; \
--- 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.18+210921'
-ARG sha256_checksum='7ed144511d6d8bcfc99d9aff2d0c94bf27fbea302ee7d19a8de7aef09cb7245a'
+ARG version='3.27.21+211021'
+ARG sha256_checksum='c54bbc4116b595485f4292c0d0b218049f36b579deffae2a192e350cbe4170b6'

 # Install OS dependencies
 RUN set -ex; \
--- 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.13+210923'
-ARG sha256_checksum='ee752da93df29d5343e6c21bf58a699c45697d50a527996ae0154ff8bd911485'
+ARG version='5.1.14+210927'
+ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
 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'}
@@ -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.13+210923'
-ARG sha256_checksum='ee752da93df29d5343e6c21bf58a699c45697d50a527996ae0154ff8bd911485'
+ARG version='5.1.14+210927'
+ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
 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'}
@@ -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.13+210923'
-ARG sha256_checksum='ee752da93df29d5343e6c21bf58a699c45697d50a527996ae0154ff8bd911485'
+ARG version='5.1.14+210927'
+ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
 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'}
@@ -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
@@ -104,6 +104,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 | DB_SOCK         | Database unix socket instead of host/port |
 | DB_NAME         | Database name                             |
 | DB_TABLE_PREFIX | Database 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
Author	SHA1	Message	Date
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