Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust start-period and retries for fts, collabora and clamav #5761

Merged
merged 1 commit into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Containers/clamav/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ USER 100

LABEL com.centurylinklabs.watchtower.enable="false"

HEALTHCHECK --start-period=60s --retries=9 CMD clamdcheck.sh

ENTRYPOINT ["/init-unprivileged"]
2 changes: 1 addition & 1 deletion Containers/collabora/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ COPY --chmod=775 healthcheck.sh /healthcheck.sh

USER 100

HEALTHCHECK --start-period=360s CMD /healthcheck.sh
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.enable="false"
2 changes: 1 addition & 1 deletion Containers/onlyoffice/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ FROM onlyoffice/documentserver:8.2.2.1

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"
12 changes: 6 additions & 6 deletions manual-install/latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,12 @@ services:
image: nextcloud/aio-collabora:latest
init: true
healthcheck:
start_period: 360s
start_period: 60s
test: /healthcheck.sh
interval: 30s
timeout: 30s
start_interval: 5s
retries: 3
retries: 9
expose:
- "9980"
environment:
Expand Down Expand Up @@ -337,12 +337,12 @@ services:
user: "100"
init: false
healthcheck:
start_period: 360s
start_period: 60s
test: clamdcheck.sh
interval: 30s
timeout: 30s
start_interval: 5s
retries: 3
retries: 9
expose:
- "3310"
environment:
Expand All @@ -366,12 +366,12 @@ services:
image: nextcloud/aio-onlyoffice:latest
init: true
healthcheck:
start_period: 360s
start_period: 60s
test: /healthcheck.sh
interval: 30s
timeout: 30s
start_interval: 5s
retries: 3
retries: 9
expose:
- "80"
environment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@ spec:
exec:
command:
- clamdcheck.sh
failureThreshold: 3
initialDelaySeconds: 360
failureThreshold: 9
initialDelaySeconds: 60
periodSeconds: 30
timeoutSeconds: 30
livenessProbe:
exec:
command:
- clamdcheck.sh
failureThreshold: 3
initialDelaySeconds: 360
failureThreshold: 9
initialDelaySeconds: 60
periodSeconds: 30
timeoutSeconds: 30
name: nextcloud-aio-clamav
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ spec:
exec:
command:
- /healthcheck.sh
failureThreshold: 3
initialDelaySeconds: 360
failureThreshold: 9
initialDelaySeconds: 60
periodSeconds: 30
timeoutSeconds: 30
livenessProbe:
exec:
command:
- /healthcheck.sh
failureThreshold: 3
initialDelaySeconds: 360
failureThreshold: 9
initialDelaySeconds: 60
periodSeconds: 30
timeoutSeconds: 30
name: nextcloud-aio-collabora
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ spec:
exec:
command:
- /healthcheck.sh
failureThreshold: 3
initialDelaySeconds: 360
failureThreshold: 9
initialDelaySeconds: 60
periodSeconds: 30
timeoutSeconds: 30
livenessProbe:
exec:
command:
- /healthcheck.sh
failureThreshold: 3
initialDelaySeconds: 360
failureThreshold: 9
initialDelaySeconds: 60
periodSeconds: 30
timeoutSeconds: 30
name: nextcloud-aio-onlyoffice
Expand Down
12 changes: 6 additions & 6 deletions php/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,12 @@
"image": "nextcloud/aio-collabora",
"init": true,
"healthcheck": {
"start_period": "360s",
"start_period": "60s",
"test": "/healthcheck.sh",
"interval": "30s",
"timeout": "30s",
"start_interval": "5s",
"retries": 3
"retries": 9
},
"expose": [
"9980"
Expand Down Expand Up @@ -657,12 +657,12 @@
"user": "100",
"init": false,
"healthcheck": {
"start_period": "360s",
"start_period": "60s",
"test": "clamdcheck.sh",
"interval": "30s",
"timeout": "30s",
"start_interval": "5s",
"retries": 3
"retries": 9
},
"expose": [
"3310"
Expand Down Expand Up @@ -704,12 +704,12 @@
"image": "nextcloud/aio-onlyoffice",
"init": true,
"healthcheck": {
"start_period": "360s",
"start_period": "60s",
"test": "/healthcheck.sh",
"interval": "30s",
"timeout": "30s",
"start_interval": "5s",
"retries": 3
"retries": 9
},
"expose": [
"80"
Expand Down