eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #5761 from nextcloud/enh/noid/adjust-timeouts

Browse source 
adjust start-period and retries for fts, collabora and clamav
This commit is contained in:
Simon L. 2024-12-16 13:47:50 +01:00 • committed by GitHub
commit 2d6c916015
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containers/clamav/Dockerfile
View file

@ -23,4 +23,6 @@ USER 100
LABEL com.centurylinklabs.watchtower.enable="false" LABEL com.centurylinklabs.watchtower.enable="false"
HEALTHCHECK --start-period=60s --retries=9 CMD clamdcheck.sh
ENTRYPOINT ["/init-unprivileged"] ENTRYPOINT ["/init-unprivileged"]

2
Containers/collabora/Dockerfile
View file

@ -20,5 +20,5 @@ COPY --chmod=775 healthcheck.sh /healthcheck.sh
USER 100 USER 100
HEALTHCHECK --start-period=360s CMD /healthcheck.sh HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.enable="false" LABEL com.centurylinklabs.watchtower.enable="false"

2
Containers/onlyoffice/Dockerfile
View file

@ -6,5 +6,5 @@ FROM onlyoffice/documentserver:8.2.2.1
COPY --chmod=775 healthcheck.sh /healthcheck.sh COPY --chmod=775 healthcheck.sh /healthcheck.sh
HEALTHCHECK --start-period=360s CMD /healthcheck.sh HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.enable="false" LABEL com.centurylinklabs.watchtower.enable="false"

12
manual-install/latest.yml
View file

@ -240,12 +240,12 @@ services:
image: nextcloud/aio-collabora:latest image: nextcloud/aio-collabora:latest
init: true init: true
healthcheck: healthcheck:
start_period: 360s start_period: 60s
test: /healthcheck.sh test: /healthcheck.sh
interval: 30s interval: 30s
timeout: 30s timeout: 30s
start_interval: 5s start_interval: 5s
retries: 3 retries: 9
expose: expose:
- "9980" - "9980"
environment: environment:
@ -337,12 +337,12 @@ services:
user: "100" user: "100"
init: false init: false
healthcheck: healthcheck:
start_period: 360s start_period: 60s
test: clamdcheck.sh test: clamdcheck.sh
interval: 30s interval: 30s
timeout: 30s timeout: 30s
start_interval: 5s start_interval: 5s
retries: 3 retries: 9
expose: expose:
- "3310" - "3310"
environment: environment:
@ -366,12 +366,12 @@ services:
image: nextcloud/aio-onlyoffice:latest image: nextcloud/aio-onlyoffice:latest
init: true init: true
healthcheck: healthcheck:
start_period: 360s start_period: 60s
test: /healthcheck.sh test: /healthcheck.sh
interval: 30s interval: 30s
timeout: 30s timeout: 30s
start_interval: 5s start_interval: 5s
retries: 3 retries: 9
expose: expose:
- "80" - "80"
environment: environment:

8
nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
View file

@ -67,16 +67,16 @@ spec:
exec: exec:
command: command:
- clamdcheck.sh - clamdcheck.sh
failureThreshold: 3 failureThreshold: 9
initialDelaySeconds: 360 initialDelaySeconds: 60
periodSeconds: 30 periodSeconds: 30
timeoutSeconds: 30 timeoutSeconds: 30
livenessProbe: livenessProbe:
exec: exec:
command: command:
- clamdcheck.sh - clamdcheck.sh
failureThreshold: 3 failureThreshold: 9
initialDelaySeconds: 360 initialDelaySeconds: 60
periodSeconds: 30 periodSeconds: 30
timeoutSeconds: 30 timeoutSeconds: 30
name: nextcloud-aio-clamav name: nextcloud-aio-clamav

8
nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
View file

@ -39,16 +39,16 @@ spec:
exec: exec:
command: command:
- /healthcheck.sh - /healthcheck.sh
failureThreshold: 3 failureThreshold: 9
initialDelaySeconds: 360 initialDelaySeconds: 60
periodSeconds: 30 periodSeconds: 30
timeoutSeconds: 30 timeoutSeconds: 30
livenessProbe: livenessProbe:
exec: exec:
command: command:
- /healthcheck.sh - /healthcheck.sh
failureThreshold: 3 failureThreshold: 9
initialDelaySeconds: 360 initialDelaySeconds: 60
periodSeconds: 30 periodSeconds: 30
timeoutSeconds: 30 timeoutSeconds: 30
name: nextcloud-aio-collabora name: nextcloud-aio-collabora

8
nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
View file

@ -47,16 +47,16 @@ spec:
exec: exec:
command: command:
- /healthcheck.sh - /healthcheck.sh
failureThreshold: 3 failureThreshold: 9
initialDelaySeconds: 360 initialDelaySeconds: 60
periodSeconds: 30 periodSeconds: 30
timeoutSeconds: 30 timeoutSeconds: 30
livenessProbe: livenessProbe:
exec: exec:
command: command:
- /healthcheck.sh - /healthcheck.sh
failureThreshold: 3 failureThreshold: 9
initialDelaySeconds: 360 initialDelaySeconds: 60
periodSeconds: 30 periodSeconds: 30
timeoutSeconds: 30 timeoutSeconds: 30
name: nextcloud-aio-onlyoffice name: nextcloud-aio-onlyoffice

12
php/containers.json
View file

@ -375,12 +375,12 @@
"image": "nextcloud/aio-collabora", "image": "nextcloud/aio-collabora",
"init": true, "init": true,
"healthcheck": { "healthcheck": {
"start_period": "360s", "start_period": "60s",
"test": "/healthcheck.sh", "test": "/healthcheck.sh",
"interval": "30s", "interval": "30s",
"timeout": "30s", "timeout": "30s",
"start_interval": "5s", "start_interval": "5s",
"retries": 3 "retries": 9
}, },
"expose": [ "expose": [
"9980" "9980"
@ -657,12 +657,12 @@
"user": "100", "user": "100",
"init": false, "init": false,
"healthcheck": { "healthcheck": {
"start_period": "360s", "start_period": "60s",
"test": "clamdcheck.sh", "test": "clamdcheck.sh",
"interval": "30s", "interval": "30s",
"timeout": "30s", "timeout": "30s",
"start_interval": "5s", "start_interval": "5s",
"retries": 3 "retries": 9
}, },
"expose": [ "expose": [
"3310" "3310"
@ -704,12 +704,12 @@
"image": "nextcloud/aio-onlyoffice", "image": "nextcloud/aio-onlyoffice",
"init": true, "init": true,
"healthcheck": { "healthcheck": {
"start_period": "360s", "start_period": "60s",
"test": "/healthcheck.sh", "test": "/healthcheck.sh",
"interval": "30s", "interval": "30s",
"timeout": "30s", "timeout": "30s",
"start_interval": "5s", "start_interval": "5s",
"retries": 3 "retries": 9
}, },
"expose": [ "expose": [
"80" "80"