aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Dan Mateas 2023-09-16 23:37:13 +00:00
commit a43267b762
10 changed files with 61 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
25/apache/Dockerfile
View file

@ -121,15 +121,22 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
RUN a2enmod headers rewrite remoteip ;\ RUN a2enmod headers rewrite remoteip ; \
{\ { \
echo RemoteIPHeader X-Real-IP ;\ echo 'RemoteIPHeader X-Real-IP'; \
echo RemoteIPInternalProxy 10.0.0.0/8 ;\ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
echo RemoteIPInternalProxy 172.16.0.0/12 ;\ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
echo RemoteIPInternalProxy 192.168.0.0/16 ;\ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip 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 ENV NEXTCLOUD_VERSION 25.0.11
RUN set -ex; \ RUN set -ex; \

21
26/apache/Dockerfile
View file

@ -122,15 +122,22 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
RUN a2enmod headers rewrite remoteip ;\ RUN a2enmod headers rewrite remoteip ; \
{\ { \
echo RemoteIPHeader X-Real-IP ;\ echo 'RemoteIPHeader X-Real-IP'; \
echo RemoteIPInternalProxy 10.0.0.0/8 ;\ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
echo RemoteIPInternalProxy 172.16.0.0/12 ;\ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
echo RemoteIPInternalProxy 192.168.0.0/16 ;\ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip 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 ENV NEXTCLOUD_VERSION 26.0.6
RUN set -ex; \ RUN set -ex; \

27
27/apache/Dockerfile
View file

@ -122,16 +122,23 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
RUN a2enmod headers rewrite remoteip ;\ RUN a2enmod headers rewrite remoteip ; \
{\ { \
echo RemoteIPHeader X-Real-IP ;\ echo 'RemoteIPHeader X-Real-IP'; \
echo RemoteIPInternalProxy 10.0.0.0/8 ;\ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
echo RemoteIPInternalProxy 172.16.0.0/12 ;\ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
echo RemoteIPInternalProxy 192.168.0.0/16 ;\ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip 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; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -141,8 +148,8 @@ RUN set -ex; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \ 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 "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.0.2.tar.bz2.asc"; \ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

6
27/fpm-alpine/Dockerfile
View file

@ -111,7 +111,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 27.0.2 ENV NEXTCLOUD_VERSION 27.1.0
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \
@ -119,8 +119,8 @@ RUN set -ex; \
gnupg \ 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 "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.0.2.tar.bz2.asc"; \ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

6
27/fpm/Dockerfile
View file

@ -123,7 +123,7 @@ RUN { \
VOLUME /var/www/html VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 27.0.2 ENV NEXTCLOUD_VERSION 27.1.0
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \
@ -133,8 +133,8 @@ RUN set -ex; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \ 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 "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.0.2.tar.bz2.asc"; \ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \ export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc # gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

4
README.md
View file

@ -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_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. - `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 ## Auto configuration via hook folders

2
generate-stackbrew-library.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -Eeuo pipefail set -Eeuo pipefail
stable_channel='27.0.2' stable_channel='27.1.0'
self="$(basename "$BASH_SOURCE")" self="$(basename "$BASH_SOURCE")"
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

2
latest.txt
View file

@ -1 +1 @@
27.0.2 27.1.0

2
update.sh
View file

@ -29,7 +29,7 @@ declare -A base=(
) )
declare -A extras=( 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]=''
[fpm-alpine]='' [fpm-alpine]=''
) )

6
versions.json
View file

@ -1,9 +1,9 @@
{ {
"27": { "27": {
"branch": "27", "branch": "27",
"version": "27.0.2", "version": "27.1.0",
"url": "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2", "url": "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2",
"ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-27.0.2.tar.bz2.asc", "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-27.1.0.tar.bz2.asc",
"variants": { "variants": {
"apache": { "apache": {
"variant": "apache", "variant": "apache",