diff options
Diffstat (limited to '18.0')
| -rw-r--r-- | 18.0/apache/Dockerfile | 2 | ||||
| -rw-r--r-- | 18.0/apache/config/autoconfig.php | 4 | ||||
| -rwxr-xr-x | 18.0/apache/entrypoint.sh | 4 | ||||
| -rw-r--r-- | 18.0/fpm-alpine/Dockerfile | 2 | ||||
| -rw-r--r-- | 18.0/fpm-alpine/config/autoconfig.php | 4 | ||||
| -rwxr-xr-x | 18.0/fpm-alpine/entrypoint.sh | 4 | ||||
| -rw-r--r-- | 18.0/fpm/Dockerfile | 2 | ||||
| -rw-r--r-- | 18.0/fpm/config/autoconfig.php | 4 | ||||
| -rwxr-xr-x | 18.0/fpm/entrypoint.sh | 4 |
9 files changed, 3 insertions, 27 deletions
diff --git a/18.0/apache/Dockerfile b/18.0/apache/Dockerfile index 7ee8c5fc..19444769 100644 --- a/18.0/apache/Dockerfile +++ b/18.0/apache/Dockerfile @@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 18.0.5 +ENV NEXTCLOUD_VERSION 18.0.6 RUN set -ex; \ fetchDeps=" \ diff --git a/18.0/apache/config/autoconfig.php b/18.0/apache/config/autoconfig.php index deeabe4e..5bb85d42 100644 --- a/18.0/apache/config/autoconfig.php +++ b/18.0/apache/config/autoconfig.php @@ -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"; } diff --git a/18.0/apache/entrypoint.sh b/18.0/apache/entrypoint.sh index 07b44d61..b9ec5fc5 100755 --- a/18.0/apache/entrypoint.sh +++ b/18.0/apache/entrypoint.sh @@ -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"' diff --git a/18.0/fpm-alpine/Dockerfile b/18.0/fpm-alpine/Dockerfile index 1d5e067c..70713bb0 100644 --- a/18.0/fpm-alpine/Dockerfile +++ b/18.0/fpm-alpine/Dockerfile @@ -94,7 +94,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 18.0.5 +ENV NEXTCLOUD_VERSION 18.0.6 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/18.0/fpm-alpine/config/autoconfig.php b/18.0/fpm-alpine/config/autoconfig.php index deeabe4e..5bb85d42 100644 --- a/18.0/fpm-alpine/config/autoconfig.php +++ b/18.0/fpm-alpine/config/autoconfig.php @@ -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"; } diff --git a/18.0/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh index 07b44d61..b9ec5fc5 100755 --- a/18.0/fpm-alpine/entrypoint.sh +++ b/18.0/fpm-alpine/entrypoint.sh @@ -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"' diff --git a/18.0/fpm/Dockerfile b/18.0/fpm/Dockerfile index 8159c95d..173c80c3 100644 --- a/18.0/fpm/Dockerfile +++ b/18.0/fpm/Dockerfile @@ -107,7 +107,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 18.0.5 +ENV NEXTCLOUD_VERSION 18.0.6 RUN set -ex; \ fetchDeps=" \ diff --git a/18.0/fpm/config/autoconfig.php b/18.0/fpm/config/autoconfig.php index deeabe4e..5bb85d42 100644 --- a/18.0/fpm/config/autoconfig.php +++ b/18.0/fpm/config/autoconfig.php @@ -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"; } diff --git a/18.0/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh index 07b44d61..b9ec5fc5 100755 --- a/18.0/fpm/entrypoint.sh +++ b/18.0/fpm/entrypoint.sh @@ -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"' |