0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-24 20:34:10 +02:00

Remove db prefix option (#1131)

* Remove db prefix option

Signed-off-by: J0WI <J0WI@users.noreply.github.com>

* Upgrade to 18.0.6

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
This commit is contained in:
J0WI 2020-06-09 13:26:33 +00:00 committed by GitHub
parent 0599d1022c
commit 3ac6fde8d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 4 additions and 109 deletions

View file

@ -23,9 +23,5 @@ if (getenv('SQLITE_DATABASE')) {
}
if ($autoconfig_enabled) {
if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
$AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
}
$AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
}

View file

@ -115,10 +115,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
# shellcheck disable=SC2016
install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
# shellcheck disable=SC2016
install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
fi
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'