mykitserver/docker-limesurvey
1
0
Fork 0
mirror of https://github.com/mykitserver/docker-limesurvey.git synced 2025-12-06 16:39:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update entrypoint to enable an empty table prefix (#100)

Browse Source 
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
This commit is contained in:
Markus Opolka
2021-11-08 20:38:35 +01:00
committed by GitHub
parent 681f421d6f
commit 1676677dfc
8 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3.0/apache/entrypoint.sh
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',

2
3.0/fpm-alpine/entrypoint.sh
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',

2
3.0/fpm/entrypoint.sh
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',

2
5.0/apache/entrypoint.sh
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',

2
5.0/fpm-alpine/entrypoint.sh
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',

2
5.0/fpm/entrypoint.sh
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',

2
README.md
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 |

2
docker-compose.yml
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: