diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile index b5090bf1..3326a29e 100644 --- a/25/apache/Dockerfile +++ b/25/apache/Dockerfile @@ -121,15 +121,22 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod headers rewrite remoteip ;\ - {\ - echo RemoteIPHeader X-Real-IP ;\ - echo RemoteIPInternalProxy 10.0.0.0/8 ;\ - echo RemoteIPInternalProxy 172.16.0.0/12 ;\ - echo RemoteIPInternalProxy 192.168.0.0/16 ;\ - } > /etc/apache2/conf-available/remoteip.conf;\ +RUN a2enmod headers rewrite remoteip ; \ + { \ + echo 'RemoteIPHeader X-Real-IP'; \ + echo 'RemoteIPInternalProxy 10.0.0.0/8'; \ + echo 'RemoteIPInternalProxy 172.16.0.0/12'; \ + echo 'RemoteIPInternalProxy 192.168.0.0/16'; \ + } > /etc/apache2/conf-available/remoteip.conf; \ a2enconf remoteip +# set apache config LimitRequestBody +ENV APACHE_BODY_LIMIT 1073741824 +RUN { \ + echo 'LimitRequestBody ${APACHE_BODY_LIMIT}'; \ + } > /etc/apache2/conf-available/apache-limits.conf; \ + a2enconf apache-limits + ENV NEXTCLOUD_VERSION 25.0.11 RUN set -ex; \ diff --git a/26/apache/Dockerfile b/26/apache/Dockerfile index 7f0292cb..2b6d5616 100644 --- a/26/apache/Dockerfile +++ b/26/apache/Dockerfile @@ -122,15 +122,22 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod headers rewrite remoteip ;\ - {\ - echo RemoteIPHeader X-Real-IP ;\ - echo RemoteIPInternalProxy 10.0.0.0/8 ;\ - echo RemoteIPInternalProxy 172.16.0.0/12 ;\ - echo RemoteIPInternalProxy 192.168.0.0/16 ;\ - } > /etc/apache2/conf-available/remoteip.conf;\ +RUN a2enmod headers rewrite remoteip ; \ + { \ + echo 'RemoteIPHeader X-Real-IP'; \ + echo 'RemoteIPInternalProxy 10.0.0.0/8'; \ + echo 'RemoteIPInternalProxy 172.16.0.0/12'; \ + echo 'RemoteIPInternalProxy 192.168.0.0/16'; \ + } > /etc/apache2/conf-available/remoteip.conf; \ a2enconf remoteip +# set apache config LimitRequestBody +ENV APACHE_BODY_LIMIT 1073741824 +RUN { \ + echo 'LimitRequestBody ${APACHE_BODY_LIMIT}'; \ + } > /etc/apache2/conf-available/apache-limits.conf; \ + a2enconf apache-limits + ENV NEXTCLOUD_VERSION 26.0.6 RUN set -ex; \ diff --git a/27/apache/Dockerfile b/27/apache/Dockerfile index 5adac66f..d81d6cfa 100644 --- a/27/apache/Dockerfile +++ b/27/apache/Dockerfile @@ -122,16 +122,23 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod headers rewrite remoteip ;\ - {\ - echo RemoteIPHeader X-Real-IP ;\ - echo RemoteIPInternalProxy 10.0.0.0/8 ;\ - echo RemoteIPInternalProxy 172.16.0.0/12 ;\ - echo RemoteIPInternalProxy 192.168.0.0/16 ;\ - } > /etc/apache2/conf-available/remoteip.conf;\ +RUN a2enmod headers rewrite remoteip ; \ + { \ + echo 'RemoteIPHeader X-Real-IP'; \ + echo 'RemoteIPInternalProxy 10.0.0.0/8'; \ + echo 'RemoteIPInternalProxy 172.16.0.0/12'; \ + echo 'RemoteIPInternalProxy 192.168.0.0/16'; \ + } > /etc/apache2/conf-available/remoteip.conf; \ a2enconf remoteip -ENV NEXTCLOUD_VERSION 27.0.2 +# set apache config LimitRequestBody +ENV APACHE_BODY_LIMIT 1073741824 +RUN { \ + echo 'LimitRequestBody ${APACHE_BODY_LIMIT}'; \ + } > /etc/apache2/conf-available/apache-limits.conf; \ + a2enconf apache-limits + +ENV NEXTCLOUD_VERSION 27.1.0 RUN set -ex; \ fetchDeps=" \ @@ -141,8 +148,8 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends $fetchDeps; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/27/fpm-alpine/Dockerfile b/27/fpm-alpine/Dockerfile index c05481c0..a49e7bdc 100644 --- a/27/fpm-alpine/Dockerfile +++ b/27/fpm-alpine/Dockerfile @@ -111,7 +111,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 27.0.2 +ENV NEXTCLOUD_VERSION 27.1.0 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ @@ -119,8 +119,8 @@ RUN set -ex; \ gnupg \ ; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/27/fpm/Dockerfile b/27/fpm/Dockerfile index e855cf9b..96e8892f 100644 --- a/27/fpm/Dockerfile +++ b/27/fpm/Dockerfile @@ -123,7 +123,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 27.0.2 +ENV NEXTCLOUD_VERSION 27.1.0 RUN set -ex; \ fetchDeps=" \ @@ -133,8 +133,8 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends $fetchDeps; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/README.md b/README.md index 31531767..a4592d70 100644 --- a/README.md +++ b/README.md @@ -201,6 +201,10 @@ To customize other PHP limits you can simply change the following variables: - `PHP_MEMORY_LIMIT` (default `512M`) This sets the maximum amount of memory in bytes that a script is allowed to allocate. This is meant to help prevent poorly written scripts from eating up all available memory but it can prevent normal operation if set too tight. - `PHP_UPLOAD_LIMIT` (default `512M`) This sets the upload limit (`post_max_size` and `upload_max_filesize`) for big files. Note that you may have to change other limits depending on your client, webserver or operating system. Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html) for more information. +To customize Apache max file upload limit you can change the following variable: +- `APACHE_BODY_LIMIT` (default `1073741824` [1GiB]) This restricts the total +size of the HTTP request body sent from the client. It specifies the number of _bytes_ that are allowed in a request body. A value of **0** means **unlimited**. Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html#apache) for more information. + ## Auto configuration via hook folders diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index c42ff1bb..96f59ea8 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -Eeuo pipefail -stable_channel='27.0.2' +stable_channel='27.1.0' self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" diff --git a/latest.txt b/latest.txt index 291c9c43..47334033 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -27.0.2 +27.1.0 diff --git a/update.sh b/update.sh index 3e85ef84..f5e6f019 100755 --- a/update.sh +++ b/update.sh @@ -29,7 +29,7 @@ declare -A base=( ) declare -A extras=( - [apache]='\nRUN a2enmod headers rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPInternalProxy 10.0.0.0/8 ;\\\n echo RemoteIPInternalProxy 172.16.0.0/12 ;\\\n echo RemoteIPInternalProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip' + [apache]='\nRUN a2enmod headers rewrite remoteip ; \\\n { \\\n echo '\''RemoteIPHeader X-Real-IP'\''; \\\n echo '\''RemoteIPInternalProxy 10.0.0.0/8'\''; \\\n echo '\''RemoteIPInternalProxy 172.16.0.0/12'\''; \\\n echo '\''RemoteIPInternalProxy 192.168.0.0/16'\''; \\\n } > /etc/apache2/conf-available/remoteip.conf; \\\n a2enconf remoteip\n\n# set apache config LimitRequestBody\nENV APACHE_BODY_LIMIT 1073741824\nRUN { \\\n echo '\''LimitRequestBody ${APACHE_BODY_LIMIT}'\''; \\\n } > /etc/apache2/conf-available/apache-limits.conf; \\\n a2enconf apache-limits' [fpm]='' [fpm-alpine]='' ) diff --git a/versions.json b/versions.json index 945a7928..e9c92264 100644 --- a/versions.json +++ b/versions.json @@ -1,9 +1,9 @@ { "27": { "branch": "27", - "version": "27.0.2", - "url": "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2", - "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2.asc", + "version": "27.1.0", + "url": "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2", + "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2.asc", "variants": { "apache": { "variant": "apache",