Compare commits

...

8 Commits

Author SHA1 Message Date
a0e8fdad40 chore: publish 4.0.6+26.0.2-fpm release 2023-06-14 14:59:20 +02:00
6427ce181f fix postgres healtcheck 2023-06-14 14:59:03 +02:00
37f575038b chore: publish 4.0.5+26.0.2-fpm release 2023-06-13 13:46:45 +02:00
7e4c87346a fix: release the fpm handbrake
it seems like php-fpm applys configs in aphabetical order, so that our
fpm-tune was overwritten by the www.conf with default values.

so let's go on highspeed now! :)
2023-06-13 13:20:26 +02:00
944230afe0 chore: publish 4.0.4+26.0.2-fpm release 2023-06-09 15:42:40 +02:00
63a1787ad6 fix env fpm default values overwriteable 2023-06-09 15:38:52 +02:00
3wc
1deee41205 chore: publish 4.0.3+26.0.2-fpm release 2023-06-09 10:31:49 +01:00
b8d209e531 chore: publish 4.0.2+26.0.2-fpm release 2023-06-08 17:52:27 +01:00
3 changed files with 14 additions and 13 deletions

View File

@ -19,6 +19,7 @@ SECRET_ADMIN_PASSWORD_VERSION=v1
EXTRA_VOLUME=/dev/null:/tmp/.dummy
PHP_MEMORY_LIMIT=1G
# fpm-tune, see: https://spot13.com/pmcalculator/
FPM_MAX_CHILDREN=131
FPM_START_SERVERS=32

View File

@ -16,13 +16,13 @@ services:
networks:
- internal
environment:
POSTGRES_USER: nextcloud
POSTGRES_USER: nextcloud
POSTGRES_PASSWORD_FILE: /run/secrets/db_password
POSTGRES_DB: nextcloud
POSTGRES_DB: nextcloud
secrets:
- db_password
healthcheck:
test: ["CMD-SHELL", "pg_isready"]
test: ["CMD-SHELL", "pg_isready", "-U", "nextcloud"]
interval: 10s
timeout: 5s
retries: 5

View File

@ -1,7 +1,7 @@
version: "3.8"
services:
web:
image: nginx:1.24.0
image: nginx:1.25.0
configs:
- source: nginx_conf
target: /etc/nginx/nginx.conf
@ -41,12 +41,12 @@ services:
start_period: 5m
app:
image: nextcloud:26.0.1-fpm
image: nextcloud:26.0.2-fpm
depends_on:
- db
configs:
- source: fpm_tune
target: /usr/local/etc/php-fpm.d/fpm-tune.conf
target: /usr/local/etc/php-fpm.d/zzz-fpm-tune.conf
- source: entrypoint
target: /custom-entrypoint.sh
mode: 555
@ -67,11 +67,11 @@ services:
- TRUSTED_PROXIES=10.0.0.0/8
- REDIS_HOST=cache
- OVERWRITEPROTOCOL=https
- PHP_MEMORY_LIMIT=1G
- FPM_MAX_CHILDREN=131
- FPM_START_SERVERS=32
- FPM_MIN_SPARE_SERVERS=32
- FPM_MAX_SPARE_SERVERS=98
- PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-1G}
- FPM_MAX_CHILDREN=${FPM_MAX_CHILDREN:-131}
- FPM_START_SERVERS=${FPM_START_SERVERS:-32}
- FPM_MIN_SPARE_SERVERS=${FPM_MIN_SPARE_SERVERS:-32}
- FPM_MAX_SPARE_SERVERS=${FPM_MAX_SPARE_SERVERS:-98}
- DEFAULT_QUOTA
volumes:
- nextcloud:/var/www/html/
@ -86,7 +86,7 @@ services:
failure_action: rollback
order: start-first
labels:
- "coop-cloud.${STACK_NAME}.version=4.0.1+26.0.1-fpm"
- "coop-cloud.${STACK_NAME}.version=4.0.6+26.0.2-fpm"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=true"
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
@ -98,7 +98,7 @@ services:
start_period: 5m
cron:
image: nextcloud:26.0.1-fpm
image: nextcloud:26.0.2-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached