Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions 31/apache/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,13 @@ 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
Expand Down
9 changes: 9 additions & 0 deletions 31/fpm/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,15 @@ 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
# 1000 is the internal PHP PDO constant for PDO::PGSQL_ATTR_SSL_MODE
run_as 'php /var/www/html/occ config:system:set dbdriveroptions 1000 --value="'$POSTGRES_SSLMODE'" --type=string'
fi

if [ -n "$POSTGRES_SSLCA" ]; then
# 1012 is the internal PHP PDO constant for PDO::PGSQL_ATTR_SSL_CA
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"
Expand Down
10 changes: 5 additions & 5 deletions 32/apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"; \
Expand Down Expand Up @@ -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=" \
Expand Down
7 changes: 6 additions & 1 deletion 32/apache/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +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 "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database"
# shellcheck disable=SC2016
Expand Down Expand Up @@ -263,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
Expand Down