Upgrading to Version 5.1.14+210927

* Update entrypoint to allow customization of MySQL engine
* Update fpm images to customize MySQL engine
* Update README for MySQL engine values and default

3.0/apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.8+210721'
+ARG version='3.27.19+210928'
-ARG sha256_checksum='5eb216a576649d77cd7c49d23727be809c7f64d85e70b8bdb80b4d2921fb6ab1'
+ARG sha256_checksum='b52ea9ce679be02d97de7c997b43292e88f8195135233c725769c38f9e96d48f'
 ARG USER=root
 ARG LISTEN_PORT=80
 

3.0/fpm-alpine/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.8+210721'
+ARG version='3.27.19+210928'
-ARG sha256_checksum='5eb216a576649d77cd7c49d23727be809c7f64d85e70b8bdb80b4d2921fb6ab1'
+ARG sha256_checksum='b52ea9ce679be02d97de7c997b43292e88f8195135233c725769c38f9e96d48f'
 
 # Install OS dependencies
 RUN set -ex; \

3.0/fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.8+210721'
+ARG version='3.27.19+210928'
-ARG sha256_checksum='5eb216a576649d77cd7c49d23727be809c7f64d85e70b8bdb80b4d2921fb6ab1'
+ARG sha256_checksum='b52ea9ce679be02d97de7c997b43292e88f8195135233c725769c38f9e96d48f'
 
 # Install OS dependencies
 RUN set -ex; \

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',
   )
 );
 

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',
   )
 );
 

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',
   )
 );
 

5.0/apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:8-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.0.9+210722'
+ARG version='5.1.14+210927'
-ARG sha256_checksum='2d9bc1ba0874f462bac6c94cad16127d0d231e0a257d8e895578354d28a84812'
+ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
 ARG USER=www-data
 ARG LISTEN_PORT=8080
 

5.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:-}
@@ -113,6 +114,7 @@ return array(
     'publicurl'=>'$PUBLIC_URL',
     'debug'=>$DEBUG,
     'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
   )
 );
 

5.0/fpm-alpine/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:8-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.0.9+210722'
+ARG version='5.1.14+210927'
-ARG sha256_checksum='2d9bc1ba0874f462bac6c94cad16127d0d231e0a257d8e895578354d28a84812'
+ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
 ARG USER=www-data
 
 # Install OS dependencies

5.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:-}
@@ -106,6 +107,7 @@ return array(
     'publicurl'=>'$PUBLIC_URL',
     'debug'=>$DEBUG,
     'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
   )
 );
 

5.0/fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:8-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.0.9+210722'
+ARG version='5.1.14+210927'
-ARG sha256_checksum='2d9bc1ba0874f462bac6c94cad16127d0d231e0a257d8e895578354d28a84812'
+ARG sha256_checksum='c32f5aad510624f7d048e75f0b590dba5baa3dd28fec13dd132c2c3ed118a219'
 ARG USER=www-data
 
 # Install OS dependencies

5.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:-}
@@ -106,6 +107,7 @@ return array(
     'publicurl'=>'$PUBLIC_URL',
     'debug'=>$DEBUG,
     'debugsql'=>$DEBUG_SQL,
+    'mysqlEngine' => '$DB_MYSQL_ENGINE',
   )
 );
 

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             |

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"

nginx-certbot/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cert_path=/etc/letsencrypt/live/$(echo "$HOSTNAMES" | awk '{print $1}')
-mkdir -p cert_path
+mkdir -p $cert_path
 
 # if there is no certificate yet, get one
 email="--email $CERT_EMAIL"
@@ -19,7 +19,7 @@ then
     echo "Getting new certificate..."
     /usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > /etc/letsencrypt/options-ssl-nginx.conf
     /usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > /etc/letsencrypt/ssl-dhparams.pem
-    /usr/bin/certbot certonly --standalone "$names" --agree-tos "$email"
+    /usr/bin/certbot certonly --standalone $names --agree-tos "$email"
 fi
 
 nginx -g "daemon off;"