diff --git a/32/apache/Dockerfile b/32/apache/Dockerfile index ceff3a6d..2ae2914e 100644 --- a/32/apache/Dockerfile +++ b/32/apache/Dockerfile @@ -19,9 +19,9 @@ RUN set -ex; \ # install the PHP extensions we need # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html -ENV PHP_MEMORY_LIMIT 512M -ENV PHP_UPLOAD_LIMIT 512M -ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128 +ENV PHP_MEMORY_LIMIT=512M +ENV PHP_UPLOAD_LIMIT=512M +ENV PHP_OPCACHE_MEMORY_CONSUMPTION=128 RUN set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ @@ -144,13 +144,13 @@ RUN a2enmod headers rewrite remoteip ; \ a2enconf remoteip # set apache config LimitRequestBody -ENV APACHE_BODY_LIMIT 1073741824 +ENV APACHE_BODY_LIMIT=1073741824 RUN { \ echo 'LimitRequestBody ${APACHE_BODY_LIMIT}'; \ } > /etc/apache2/conf-available/apache-limits.conf; \ a2enconf apache-limits -ENV NEXTCLOUD_VERSION 32.0.3 +ENV NEXTCLOUD_VERSION=32.0.3 RUN set -ex; \ fetchDeps=" \ diff --git a/32/apache/entrypoint.sh b/32/apache/entrypoint.sh index 39b1a775..7e403b63 100755 --- a/32/apache/entrypoint.sh +++ b/32/apache/entrypoint.sh @@ -216,14 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP file_env POSTGRES_DB file_env POSTGRES_PASSWORD file_env POSTGRES_USER - if [ -n "$POSTGRES_SSLMODE" ]; then - run_as 'php /var/www/html/occ config:system:set dbdriveroptions 1000 --value="'$POSTGRES_SSLMODE'" --type=string' - fi - - if [ -n "$POSTGRES_SSLCA" ]; then - run_as 'php /var/www/html/occ config:system:set dbdriveroptions 1012 --value="'$POSTGRES_SSLCA'" --type=string' - fi - + if [ -n "${SQLITE_DATABASE+x}" ]; then echo "Installing with SQLite database" # shellcheck disable=SC2016 @@ -270,6 +263,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi run_path post-installation + + if [ -n "$POSTGRES_SSLMODE" ]; then + echo "Configuring Postgres SSL Mode..." + run_as 'php /var/www/html/occ config:system:set dbdriveroptions 1000 --value="'$POSTGRES_SSLMODE'" --type=string' + fi fi fi # not enough specified to do a fully automated installation