Compare commits
2
Commits
temp
..
upload-limit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb8f0e342f | ||
|
|
178c61b3d2 |
@@ -25,6 +25,7 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
|||||||
|
|
||||||
PHP_MEMORY_LIMIT=1G
|
PHP_MEMORY_LIMIT=1G
|
||||||
PHP_UPLOAD_LIMIT=512M
|
PHP_UPLOAD_LIMIT=512M
|
||||||
|
MEM_REQUEST_BODY_SIZE=$(( 1048576 * 16 ))
|
||||||
# fpm-tune, see: https://spot13.com/pmcalculator/
|
# fpm-tune, see: https://spot13.com/pmcalculator/
|
||||||
FPM_MAX_CHILDREN=16
|
FPM_MAX_CHILDREN=16
|
||||||
FPM_START_SERVERS=4
|
FPM_START_SERVERS=4
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
export FPM_TUNE_VERSION=v5
|
export FPM_TUNE_VERSION=v5
|
||||||
export NGINX_CONF_VERSION=v8
|
export NGINX_CONF_VERSION=v8c
|
||||||
export MY_CNF_VERSION=v6
|
export MY_CNF_VERSION=v6
|
||||||
export ENTRYPOINT_VERSION=v3
|
export ENTRYPOINT_VERSION=v3
|
||||||
export ENTRYPOINT_WHITEBOARD_VERSION=v1
|
export ENTRYPOINT_WHITEBOARD_VERSION=v1
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ services:
|
|||||||
mode: 0600
|
mode: 0600
|
||||||
|
|
||||||
searchindexer:
|
searchindexer:
|
||||||
image: nextcloud:32-fpm
|
image: nextcloud:32.0.13-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
|||||||
@@ -11,8 +11,7 @@ services:
|
|||||||
|
|
||||||
db:
|
db:
|
||||||
image: "pgautoupgrade/pgautoupgrade:14-debian"
|
image: "pgautoupgrade/pgautoupgrade:14-debian"
|
||||||
#setting max_connections with -c breaks pgautoupgrade
|
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
|
||||||
#command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
|
|
||||||
volumes:
|
volumes:
|
||||||
- "postgres:/var/lib/postgresql/data"
|
- "postgres:/var/lib/postgresql/data"
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
+6
-3
@@ -14,6 +14,7 @@ services:
|
|||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
- HSTS_ENABLED
|
- HSTS_ENABLED
|
||||||
- HSTS_PRELOAD
|
- HSTS_PRELOAD
|
||||||
|
- PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT:-512M}
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
@@ -37,6 +38,8 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-buffering.buffering.maxRequestBodyBytes=0"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-buffering.buffering.memRequestBodyBytes=${MEM_REQUEST_BODY_BYTES:-1048576}"
|
||||||
- "caddy=${DOMAIN}"
|
- "caddy=${DOMAIN}"
|
||||||
- "caddy.reverse_proxy={{upstreams 80}}"
|
- "caddy.reverse_proxy={{upstreams 80}}"
|
||||||
- "caddy.tls.on_demand="
|
- "caddy.tls.on_demand="
|
||||||
@@ -48,7 +51,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:32-fpm
|
image: nextcloud:32.0.13-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
@@ -95,7 +98,7 @@ services:
|
|||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=13.1.5+32.0.13-fpm"
|
- "coop-cloud.${STACK_NAME}.version=13.1.1+32.0.12-fpm"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
||||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
- "backupbot.backup.volumes.redis=false"
|
- "backupbot.backup.volumes.redis=false"
|
||||||
@@ -109,7 +112,7 @@ services:
|
|||||||
start_period: 15m
|
start_period: 15m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:32-fpm
|
image: nextcloud:32.0.13-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
|||||||
+5
-1
@@ -54,7 +54,7 @@ http {
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
# set max upload size
|
# set max upload size
|
||||||
client_max_body_size 512M;
|
client_max_body_size {{ env "PHP_UPLOAD_LIMIT" }} ;
|
||||||
fastcgi_buffers 64 4K;
|
fastcgi_buffers 64 4K;
|
||||||
|
|
||||||
# Enable gzip but do not remove ETag headers
|
# Enable gzip but do not remove ETag headers
|
||||||
@@ -162,6 +162,10 @@ http {
|
|||||||
|
|
||||||
fastcgi_intercept_errors on;
|
fastcgi_intercept_errors on;
|
||||||
fastcgi_request_buffering off;
|
fastcgi_request_buffering off;
|
||||||
|
|
||||||
|
fastcgi_read_timeout 3600s;
|
||||||
|
fastcgi_send_timeout 3600s;
|
||||||
|
fastcgi_connect_timeout 60s;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ \.(?:css|js|svg|gif)$ {
|
location ~ \.(?:css|js|svg|gif)$ {
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
chore(deps): update mariadb docker tag to v12
|
|
||||||
chore(deps): update mariadb docker tag to v11.8
|
|
||||||
chore(deps): update nginx docker tag to v1.31.3
|
|
||||||
chore(deps): update docker.elastic.co/elasticsearch/elasticsearch docker tag to v8.19.19
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
Important:
|
|
||||||
The pgautoupgrade switch from 13.1.0+32.0.11-fpm was released untested and had a bug: the db service's `-c max_connections=...` command breaks pgautoupgrade, failing with `initdb: invalid option -- 'c'`. If your db got stuck mid-upgrade on 13.1.0-13.1.4 with that error: restore the old data dir and remove the upgrade lock file. Then redeploy this version.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Last release for nextcloud-32, pointing to the latest version of nextcloud-32.
|
|
||||||
Reference in New Issue
Block a user