Compare commits

..

2 Commits

Author SHA1 Message Date
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
11 changed files with 15 additions and 13 deletions

View File

@@ -1,7 +1,7 @@
FROM php:7.4-apache FROM php:7.4-apache
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.27.22+211026' ARG version='3.27.23+211102'
ARG sha256_checksum='9fd31e38cf692370257b21821f791f0568f6f93bbff68995467fbcec0370ff34' ARG sha256_checksum='9544dbd18ee66256c1ef1f8047d7d6ffcc70c791f7c040045d6ea65963a45a84'
ARG USER=root ARG USER=root
ARG LISTEN_PORT=80 ARG LISTEN_PORT=80

View File

@@ -89,7 +89,7 @@ return array(
'username' => '$DB_USERNAME', 'username' => '$DB_USERNAME',
'password' => '$DB_PASSWORD', 'password' => '$DB_PASSWORD',
'charset' => '$DB_CHARSET', 'charset' => '$DB_CHARSET',
'tablePrefix' => '$DB_TABLE_PREFIX', 'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
), ),
//'session' => array ( //'session' => array (
// 'class' => 'application.core.web.DbHttpSession', // 'class' => 'application.core.web.DbHttpSession',

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm-alpine FROM php:7.4-fpm-alpine
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.27.22+211026' ARG version='3.27.23+211102'
ARG sha256_checksum='9fd31e38cf692370257b21821f791f0568f6f93bbff68995467fbcec0370ff34' ARG sha256_checksum='9544dbd18ee66256c1ef1f8047d7d6ffcc70c791f7c040045d6ea65963a45a84'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \

View File

@@ -82,7 +82,7 @@ return array(
'username' => '$DB_USERNAME', 'username' => '$DB_USERNAME',
'password' => '$DB_PASSWORD', 'password' => '$DB_PASSWORD',
'charset' => '$DB_CHARSET', 'charset' => '$DB_CHARSET',
'tablePrefix' => '$DB_TABLE_PREFIX', 'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
), ),
//'session' => array ( //'session' => array (
// 'class' => 'application.core.web.DbHttpSession', // 'class' => 'application.core.web.DbHttpSession',

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm FROM php:7.4-fpm
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.27.22+211026' ARG version='3.27.23+211102'
ARG sha256_checksum='9fd31e38cf692370257b21821f791f0568f6f93bbff68995467fbcec0370ff34' ARG sha256_checksum='9544dbd18ee66256c1ef1f8047d7d6ffcc70c791f7c040045d6ea65963a45a84'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \

View File

@@ -82,7 +82,7 @@ return array(
'username' => '$DB_USERNAME', 'username' => '$DB_USERNAME',
'password' => '$DB_PASSWORD', 'password' => '$DB_PASSWORD',
'charset' => '$DB_CHARSET', 'charset' => '$DB_CHARSET',
'tablePrefix' => '$DB_TABLE_PREFIX', 'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
), ),
//'session' => array ( //'session' => array (
// 'class' => 'application.core.web.DbHttpSession', // 'class' => 'application.core.web.DbHttpSession',

View File

@@ -96,7 +96,7 @@ return array(
'username' => '$DB_USERNAME', 'username' => '$DB_USERNAME',
'password' => '$DB_PASSWORD', 'password' => '$DB_PASSWORD',
'charset' => '$DB_CHARSET', 'charset' => '$DB_CHARSET',
'tablePrefix' => '$DB_TABLE_PREFIX', 'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
), ),
//'session' => array ( //'session' => array (
// 'class' => 'application.core.web.DbHttpSession', // 'class' => 'application.core.web.DbHttpSession',

View File

@@ -89,7 +89,7 @@ return array(
'username' => '$DB_USERNAME', 'username' => '$DB_USERNAME',
'password' => '$DB_PASSWORD', 'password' => '$DB_PASSWORD',
'charset' => '$DB_CHARSET', 'charset' => '$DB_CHARSET',
'tablePrefix' => '$DB_TABLE_PREFIX', 'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
), ),
//'session' => array ( //'session' => array (
// 'class' => 'application.core.web.DbHttpSession', // 'class' => 'application.core.web.DbHttpSession',

View File

@@ -89,7 +89,7 @@ return array(
'username' => '$DB_USERNAME', 'username' => '$DB_USERNAME',
'password' => '$DB_PASSWORD', 'password' => '$DB_PASSWORD',
'charset' => '$DB_CHARSET', 'charset' => '$DB_CHARSET',
'tablePrefix' => '$DB_TABLE_PREFIX', 'tablePrefix' => '${DB_TABLE_PREFIX//[[:space:]]/}',
), ),
//'session' => array ( //'session' => array (
// 'class' => 'application.core.web.DbHttpSession', // 'class' => 'application.core.web.DbHttpSession',

View File

@@ -103,7 +103,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
| DB_PORT | Database server port | | DB_PORT | Database server port |
| DB_SOCK | Database unix socket instead of host/port | | DB_SOCK | Database unix socket instead of host/port |
| DB_NAME | Database name | | 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_MYSQL_ENGINE | MySQL engine used for survey tables (values: MyISAM, InnoDB, default: MyISAM) |
| DB_USERNAME | Database user | | DB_USERNAME | Database user |
| DB_PASSWORD | Database user's password | | DB_PASSWORD | Database user's password |

View File

@@ -17,6 +17,8 @@ services:
- "DB_HOST=lime-db" - "DB_HOST=lime-db"
- "DB_PASSWORD=secret" - "DB_PASSWORD=secret"
- "ADMIN_PASSWORD=foobar" - "ADMIN_PASSWORD=foobar"
# If you require an empty table prefix, use a space as the DB_TABLE_PREFIX
# - "DB_TABLE_PREFIX= "
lime-db: lime-db:
image: mysql:5.7 image: mysql:5.7
environment: environment: