diff --git a/.github/dependabot.yml b/.github/dependabot.yml index dc4b2021..cf226fcf 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,12 +6,14 @@ updates: interval: "daily" time: "12:00" open-pull-requests-limit: 10 + rebase-strategy: "disabled" - package-ecosystem: composer directory: "/php/" schedule: interval: "daily" time: "12:00" open-pull-requests-limit: 10 + rebase-strategy: "auto" labels: - 3. to review - dependencies @@ -39,6 +41,7 @@ updates: interval: "daily" time: "04:00" open-pull-requests-limit: 10 + rebase-strategy: "disabled" labels: - 3. to review - dependencies diff --git a/.github/workflows/talk.yml b/.github/workflows/talk.yml index ee366a64..674d6db8 100644 --- a/.github/workflows/talk.yml +++ b/.github/workflows/talk.yml @@ -36,7 +36,7 @@ jobs: # Janus janus_version="$( - git ls-remote https://github.com/meetecho/janus-gateway v0.*.* \ + git ls-remote https://github.com/meetecho/janus-gateway v1.*.* \ | cut -d/ -f3 \ | sort -V \ | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$" \ diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile index 5f45922d..95429a7a 100644 --- a/Containers/apache/Dockerfile +++ b/Containers/apache/Dockerfile @@ -2,7 +2,7 @@ FROM caddy:2.8.4-alpine AS caddy # From https://github.com/docker-library/httpd/blob/master/2.4/alpine/Dockerfile -FROM httpd:2.4.62-alpine3.20 +FROM httpd:2.4.62-alpine3.21 COPY --from=caddy /usr/bin/caddy /usr/bin/caddy diff --git a/Containers/borgbackup/Dockerfile b/Containers/borgbackup/Dockerfile index 706a9c7d..2f0e6d53 100644 --- a/Containers/borgbackup/Dockerfile +++ b/Containers/borgbackup/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN set -ex; \ \ diff --git a/Containers/clamav/Dockerfile b/Containers/clamav/Dockerfile index f0c8cacf..d42001f1 100644 --- a/Containers/clamav/Dockerfile +++ b/Containers/clamav/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:latest # Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.3/alpine/Dockerfile -FROM clamav/clamav:1.4.1-16 +FROM clamav/clamav:1.4.1-17 COPY clamav.conf /clamav.conf COPY --chmod=775 start.script /start.script @@ -23,4 +23,6 @@ USER 100 LABEL com.centurylinklabs.watchtower.enable="false" +HEALTHCHECK --start-period=60s --retries=9 CMD clamdcheck.sh + ENTRYPOINT ["/init-unprivileged"] diff --git a/Containers/collabora/Dockerfile b/Containers/collabora/Dockerfile index 277a09dc..137a12c8 100644 --- a/Containers/collabora/Dockerfile +++ b/Containers/collabora/Dockerfile @@ -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" diff --git a/Containers/docker-socket-proxy/Dockerfile b/Containers/docker-socket-proxy/Dockerfile index 7fd83337..61b115ec 100644 --- a/Containers/docker-socket-proxy/Dockerfile +++ b/Containers/docker-socket-proxy/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -FROM haproxy:3.1.0-alpine +FROM haproxy:3.1.1-alpine # hadolint ignore=DL3002 USER root diff --git a/Containers/domaincheck/Dockerfile b/Containers/domaincheck/Dockerfile index 130a0001..c6ea2a4c 100644 --- a/Containers/domaincheck/Dockerfile +++ b/Containers/domaincheck/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN set -ex; \ apk upgrade --no-cache -a; \ apk add --no-cache bash lighttpd netcat-openbsd; \ diff --git a/Containers/imaginary/Dockerfile b/Containers/imaginary/Dockerfile index 13e95168..dcd3aa85 100644 --- a/Containers/imaginary/Dockerfile +++ b/Containers/imaginary/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -FROM golang:1.23.4-alpine3.20 AS go +FROM golang:1.23.4-alpine3.21 AS go ENV IMAGINARY_HASH=8f36a26c448be8c151a3878404b75fcd1cd3cf0c @@ -13,7 +13,7 @@ RUN set -ex; \ build-base; \ go install github.com/h2non/imaginary@"$IMAGINARY_HASH"; -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN set -ex; \ apk upgrade --no-cache -a; \ apk add --no-cache \ diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index 7584e31e..ed21df4a 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:latest # Docker CLI is a requirement -FROM docker:27.3.1-cli AS docker +FROM docker:27.4.0-cli AS docker # Caddy is a requirement FROM caddy:2.8.4-alpine AS caddy -# From https://github.com/docker-library/php/blob/master/8.3/alpine3.20/fpm/Dockerfile -FROM php:8.3.14-fpm-alpine3.20 +# From https://github.com/docker-library/php/blob/master/8.3/alpine3.21/fpm/Dockerfile +FROM php:8.3.14-fpm-alpine3.21 EXPOSE 80 EXPOSE 8080 diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index e4df8f2c..efca2d09 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -FROM php:8.3.14-fpm-alpine3.20 +FROM php:8.3.14-fpm-alpine3.21 ENV PHP_MEMORY_LIMIT=512M ENV PHP_UPLOAD_LIMIT=16G @@ -8,7 +8,7 @@ ENV SOURCE_LOCATION=/usr/src/nextcloud ENV REDIS_DB_INDEX=0 # AIO settings start # Do not remove or change this line! -ENV NEXTCLOUD_VERSION=30.0.2 +ENV NEXTCLOUD_VERSION=30.0.4 ENV AIO_TOKEN=123456 ENV AIO_URL=localhost # AIO settings end # Do not remove or change this line! diff --git a/Containers/notify-push/Dockerfile b/Containers/notify-push/Dockerfile index b0fc0fd2..050770f3 100644 --- a/Containers/notify-push/Dockerfile +++ b/Containers/notify-push/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -FROM alpine:3.20.3 +FROM alpine:3.21.0 COPY --chmod=775 start.sh /start.sh COPY --chmod=775 healthcheck.sh /healthcheck.sh diff --git a/Containers/onlyoffice/Dockerfile b/Containers/onlyoffice/Dockerfile index bfecd246..6fdac5bd 100644 --- a/Containers/onlyoffice/Dockerfile +++ b/Containers/onlyoffice/Dockerfile @@ -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" diff --git a/Containers/postgresql/Dockerfile b/Containers/postgresql/Dockerfile index ee2a01e2..40479f97 100644 --- a/Containers/postgresql/Dockerfile +++ b/Containers/postgresql/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -# From https://github.com/docker-library/postgres/blob/master/16/alpine3.20/Dockerfile +# From https://github.com/docker-library/postgres/blob/master/16/alpine3.21/Dockerfile FROM postgres:16.6-alpine COPY --chmod=775 start.sh /start.sh diff --git a/Containers/talk-recording/Dockerfile b/Containers/talk-recording/Dockerfile index 470992ba..26b7baab 100644 --- a/Containers/talk-recording/Dockerfile +++ b/Containers/talk-recording/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -FROM python:3.13.1-alpine3.20 +FROM python:3.13.1-alpine3.21 COPY --chmod=775 start.sh /start.sh COPY --chmod=775 healthcheck.sh /healthcheck.sh diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile index a5c74a7b..d0864122 100644 --- a/Containers/talk/Dockerfile +++ b/Containers/talk/Dockerfile @@ -1,10 +1,10 @@ # syntax=docker/dockerfile:latest -FROM nats:2.10.22-scratch AS nats +FROM nats:2.10.23-scratch AS nats FROM eturnal/eturnal:1.12.1 AS eturnal FROM strukturag/nextcloud-spreed-signaling:2.0.1 AS signaling -FROM alpine:3.20.3 AS janus +FROM alpine:3.21.0 AS janus -ARG JANUS_VERSION=v0.15.0 +ARG JANUS_VERSION=v1.3.0 WORKDIR /src RUN set -ex; \ apk add --no-cache \ @@ -34,7 +34,7 @@ RUN set -ex; \ make configs; \ rename -v ".jcfg.sample" ".jcfg" /usr/local/etc/janus/*.jcfg.sample -FROM alpine:3.20.3 +FROM alpine:3.21.0 ENV ETURNAL_ETC_DIR="/conf" COPY --from=janus --chmod=777 --chown=1000:1000 /usr/local /usr/local COPY --from=eturnal --chmod=777 --chown=1000:1000 /opt/eturnal /opt/eturnal diff --git a/Containers/watchtower/Dockerfile b/Containers/watchtower/Dockerfile index 076cb0d5..a53993aa 100644 --- a/Containers/watchtower/Dockerfile +++ b/Containers/watchtower/Dockerfile @@ -2,7 +2,7 @@ # From https://github.com/containrrr/watchtower/blob/main/dockerfiles/Dockerfile.self-contained FROM containrrr/watchtower:1.7.1 AS watchtower -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN set -ex; \ apk upgrade --no-cache -a; \ diff --git a/manual-install/latest.yml b/manual-install/latest.yml index 15680146..15af7f53 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -22,6 +22,13 @@ services: image: nextcloud/aio-apache:latest user: "33" init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 ports: - ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp - ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/udp @@ -56,6 +63,13 @@ services: image: nextcloud/aio-postgresql:latest user: "999" init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 expose: - "5432" volumes: @@ -98,6 +112,13 @@ services: required: false image: nextcloud/aio-nextcloud:latest init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 expose: - "9000" - "9001" @@ -107,6 +128,7 @@ services: - ${NEXTCLOUD_MOUNT}:${NEXTCLOUD_MOUNT}:rw - ${NEXTCLOUD_TRUSTED_CACERTS_DIR}:/usr/local/share/ca-certificates:ro environment: + - NEXTCLOUD_HOST=nextcloud-aio-nextcloud - POSTGRES_HOST=nextcloud-aio-database - POSTGRES_PORT=5432 - POSTGRES_PASSWORD=${DATABASE_PASSWORD} @@ -165,6 +187,13 @@ services: image: nextcloud/aio-notify-push:latest user: "33" init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 expose: - "7867" volumes: @@ -188,6 +217,13 @@ services: image: nextcloud/aio-redis:latest user: "999" init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 expose: - "6379" environment: @@ -203,11 +239,18 @@ services: nextcloud-aio-collabora: image: nextcloud/aio-collabora:latest init: true + healthcheck: + start_period: 60s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 9 expose: - "9980" environment: - aliasgroup1=https://${NC_DOMAIN}:443 - - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY} --o:remote_font_config.url=https://${NC_DOMAIN}/apps/richdocuments/settings/fonts.json + - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY} --o:remote_font_config.url=https://${NC_DOMAIN}/apps/richdocuments/settings/fonts.json --o:net.post_allow_host[0]=0.0.0.0/0 --o:net.post_allow_host[1]=::/0 - dictionaries=${COLLABORA_DICTIONARIES} - TZ=${TIMEZONE} - server_name=${NC_DOMAIN} @@ -225,6 +268,13 @@ services: image: nextcloud/aio-talk:latest user: "1000" init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 ports: - ${TALK_PORT}:${TALK_PORT}/tcp - ${TALK_PORT}:${TALK_PORT}/udp @@ -256,6 +306,13 @@ services: image: nextcloud/aio-talk-recording:latest user: "122" init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 expose: - "1234" environment: @@ -279,6 +336,13 @@ services: image: nextcloud/aio-clamav:latest user: "100" init: false + healthcheck: + start_period: 60s + test: clamdcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 9 expose: - "3310" environment: @@ -301,6 +365,13 @@ services: nextcloud-aio-onlyoffice: image: nextcloud/aio-onlyoffice:latest init: true + healthcheck: + start_period: 60s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 9 expose: - "80" environment: @@ -320,6 +391,13 @@ services: image: nextcloud/aio-imaginary:latest user: "65534" init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 expose: - "9000" environment: @@ -339,6 +417,13 @@ services: nextcloud-aio-fulltextsearch: image: nextcloud/aio-fulltextsearch:latest init: false + healthcheck: + start_period: 60s + test: /healthcheck.sh + interval: 10s + timeout: 5s + start_interval: 5s + retries: 5 expose: - "9200" environment: @@ -364,6 +449,13 @@ services: image: nextcloud/aio-whiteboard:latest user: "65534" init: true + healthcheck: + start_period: 0s + test: /healthcheck.sh + interval: 30s + timeout: 30s + start_interval: 5s + retries: 3 expose: - "3002" environment: diff --git a/nextcloud-aio-helm-chart/Chart.yaml b/nextcloud-aio-helm-chart/Chart.yaml index 96ea008d..8476db24 100755 --- a/nextcloud-aio-helm-chart/Chart.yaml +++ b/nextcloud-aio-helm-chart/Chart.yaml @@ -1,6 +1,6 @@ name: nextcloud-aio-helm-chart description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose -version: 10.0.0 +version: 10.1.1 apiVersion: v2 keywords: - latest diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml index 3b7de1e6..2afc39eb 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml @@ -2,8 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-apache name: nextcloud-aio-apache @@ -18,8 +17,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-apache spec: @@ -63,7 +61,21 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: WHITEBOARD_HOST value: nextcloud-aio-whiteboard - image: nextcloud/aio-apache:20241125_091756 + image: nextcloud/aio-apache:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-apache ports: - containerPort: {{ .Values.APACHE_PORT }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml index 4b1a7667..596014ef 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml @@ -2,8 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-apache name: nextcloud-aio-apache diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml index 23975bb0..b9404df3 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml @@ -3,8 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-clamav name: nextcloud-aio-clamav @@ -19,8 +18,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-clamav spec: @@ -64,7 +62,23 @@ spec: value: "{{ .Values.NEXTCLOUD_UPLOAD_LIMIT }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-clamav:20241125_091756 + image: nextcloud/aio-clamav:20241216_102930 + readinessProbe: + exec: + command: + - clamdcheck.sh + failureThreshold: 9 + initialDelaySeconds: 60 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - clamdcheck.sh + failureThreshold: 9 + initialDelaySeconds: 60 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-clamav ports: - containerPort: 3310 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml index a0096210..68dead85 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml @@ -3,8 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-clamav name: nextcloud-aio-clamav diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml index 5973de53..9c222486 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml @@ -3,8 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-collabora name: nextcloud-aio-collabora @@ -17,8 +16,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-collabora spec: @@ -33,10 +31,26 @@ spec: - name: dictionaries value: "{{ .Values.COLLABORA_DICTIONARIES }}" - name: extra_params - value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json + value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json --o:net.post_allow_host[0]=0.0.0.0/0 --o:net.post_allow_host[1]=::/0 - name: server_name value: "{{ .Values.NC_DOMAIN }}" - image: nextcloud/aio-collabora:20241125_091756 + image: nextcloud/aio-collabora:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 9 + initialDelaySeconds: 60 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 9 + initialDelaySeconds: 60 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-collabora ports: - containerPort: 9980 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml index 57a8181f..f2e6b3cb 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml @@ -3,8 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-collabora name: nextcloud-aio-collabora diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml index 93b5fb88..581efb19 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml @@ -2,8 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-database name: nextcloud-aio-database @@ -18,8 +17,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-database spec: @@ -67,7 +65,21 @@ spec: value: nextcloud - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-postgresql:20241125_091756 + image: nextcloud/aio-postgresql:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-database ports: - containerPort: 5432 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml index f83fb954..8a022a4d 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml @@ -2,8 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-database name: nextcloud-aio-database diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml index fdb85477..39a69f64 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml @@ -3,8 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-fulltextsearch name: nextcloud-aio-fulltextsearch @@ -19,8 +18,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-fulltextsearch spec: @@ -56,7 +54,23 @@ spec: value: basic - name: xpack.security.enabled value: "false" - image: nextcloud/aio-fulltextsearch:20241125_091756 + image: nextcloud/aio-fulltextsearch:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 5 + initialDelaySeconds: 60 + periodSeconds: 10 + timeoutSeconds: 5 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 5 + initialDelaySeconds: 60 + periodSeconds: 10 + timeoutSeconds: 5 name: nextcloud-aio-fulltextsearch ports: - containerPort: 9200 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml index 6c8e415d..57a9f9a7 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml @@ -3,8 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-fulltextsearch name: nextcloud-aio-fulltextsearch diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml index 062a95df..9e5c2fd4 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml @@ -3,8 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-imaginary name: nextcloud-aio-imaginary @@ -17,8 +16,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-imaginary spec: @@ -40,7 +38,21 @@ spec: value: "{{ .Values.IMAGINARY_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-imaginary:20241125_091756 + image: nextcloud/aio-imaginary:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-imaginary ports: - containerPort: 9000 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml index d71a39ce..fd6dafb5 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml @@ -3,8 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-imaginary name: nextcloud-aio-imaginary diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml index 2b6e3e9d..ab618b42 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -2,8 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-nextcloud name: nextcloud-aio-nextcloud @@ -18,8 +17,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-nextcloud spec: @@ -122,6 +120,8 @@ spec: value: "{{ .Values.NC_DOMAIN }}" - name: NEXTCLOUD_DATA_DIR value: /mnt/ncdata + - name: NEXTCLOUD_HOST + value: nextcloud-aio-nextcloud - name: ONLYOFFICE_ENABLED value: "{{ .Values.ONLYOFFICE_ENABLED }}" - name: ONLYOFFICE_HOST @@ -178,7 +178,7 @@ spec: value: "{{ .Values.WHITEBOARD_ENABLED }}" - name: WHITEBOARD_SECRET value: "{{ .Values.WHITEBOARD_SECRET }}" - image: nextcloud/aio-nextcloud:20241125_091756 + image: nextcloud/aio-nextcloud:20241216_102930 {{- if eq (.Values.RPSS_ENABLED | default "no") "yes" }} # AIO-config - do not change this comment! securityContext: # The items below only work in container context @@ -191,6 +191,20 @@ spec: {{- end }} add: ["NET_BIND_SERVICE"] {{- end }} # AIO-config - do not change this comment! + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-nextcloud ports: - containerPort: 9000 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml index cc8bca41..1b77fb50 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml @@ -2,8 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-nextcloud name: nextcloud-aio-nextcloud diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml index 83008b74..effd71e0 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml @@ -2,8 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-notify-push name: nextcloud-aio-notify-push @@ -18,8 +17,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-notify-push spec: @@ -55,7 +53,21 @@ spec: value: nextcloud-aio-redis - name: REDIS_HOST_PASSWORD value: "{{ .Values.REDIS_PASSWORD }}" - image: nextcloud/aio-notify-push:20241125_091756 + image: nextcloud/aio-notify-push:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-notify-push ports: - containerPort: 7867 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml index dc658984..d15c1bc3 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml @@ -2,8 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-notify-push name: nextcloud-aio-notify-push diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml index 4e4eeda2..f3693fc1 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml @@ -3,8 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-onlyoffice name: nextcloud-aio-onlyoffice @@ -19,8 +18,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-onlyoffice spec: @@ -44,7 +42,23 @@ spec: value: "{{ .Values.ONLYOFFICE_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-onlyoffice:20241125_091756 + image: nextcloud/aio-onlyoffice:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 9 + initialDelaySeconds: 60 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 9 + initialDelaySeconds: 60 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-onlyoffice ports: - containerPort: 80 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml index 995e4f2c..11761892 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml @@ -3,8 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-onlyoffice name: nextcloud-aio-onlyoffice diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml index bdd3842b..93b1fb69 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml @@ -2,8 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-redis name: nextcloud-aio-redis @@ -18,8 +17,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-redis spec: @@ -41,7 +39,21 @@ spec: value: "{{ .Values.REDIS_PASSWORD }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-redis:20241125_091756 + image: nextcloud/aio-redis:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-redis ports: - containerPort: 6379 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml index e1eb0ea4..c12d28fa 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml @@ -2,8 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-redis name: nextcloud-aio-redis diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml index 52abc135..06f7defa 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml @@ -3,8 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-talk name: nextcloud-aio-talk @@ -17,8 +16,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-talk spec: @@ -54,7 +52,21 @@ spec: value: "{{ .Values.TURN_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-talk:20241125_091756 + image: nextcloud/aio-talk:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-talk ports: - containerPort: {{ .Values.TALK_PORT }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml index 04b00131..4c69e7f8 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml @@ -3,8 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-talk-recording name: nextcloud-aio-talk-recording @@ -19,8 +18,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-talk-recording spec: @@ -46,7 +44,21 @@ spec: value: "{{ .Values.RECORDING_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-talk-recording:20241125_091756 + image: nextcloud/aio-talk-recording:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-talk-recording ports: - containerPort: 1234 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml index e242050b..f2413fb2 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml @@ -3,8 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-talk-recording name: nextcloud-aio-talk-recording diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml index 29527887..d2da42f7 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml @@ -4,8 +4,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-talk name: nextcloud-aio-talk-public @@ -29,8 +28,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-talk name: nextcloud-aio-talk diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-deployment.yaml index bd6fbf3e..ca48d71d 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-deployment.yaml @@ -3,8 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-whiteboard name: nextcloud-aio-whiteboard @@ -17,8 +16,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-whiteboard spec: @@ -48,7 +46,21 @@ spec: value: redis - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-whiteboard:20241125_091756 + image: nextcloud/aio-whiteboard:20241216_102930 + readinessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 + livenessProbe: + exec: + command: + - /healthcheck.sh + failureThreshold: 3 + periodSeconds: 30 + timeoutSeconds: 30 name: nextcloud-aio-whiteboard ports: - containerPort: 3002 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-service.yaml index b0fbe7bd..8c0df7f2 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-service.yaml @@ -3,8 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml --namespace "{{ .Values.NAMESPACE }}" - kompose.version: 1.34.0 (cbf2835db) + kompose.version: 1.35.0 (9532ceef3) labels: io.kompose.service: nextcloud-aio-whiteboard name: nextcloud-aio-whiteboard diff --git a/php/composer.lock b/php/composer.lock index 3a211ef3..8a23b483 100644 --- a/php/composer.lock +++ b/php/composer.lock @@ -1422,8 +1422,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1501,8 +1501,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1575,8 +1575,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1633,16 +1633,16 @@ }, { "name": "twig/twig", - "version": "v3.16.0", + "version": "v3.17.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561" + "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/475ad2dc97d65d8631393e721e7e44fb544f0561", - "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71", + "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71", "shasum": "" }, "require": { @@ -1697,7 +1697,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.16.0" + "source": "https://github.com/twigphp/Twig/tree/v3.17.1" }, "funding": [ { @@ -1709,7 +1709,7 @@ "type": "tidelift" } ], - "time": "2024-11-29T08:27:05+00:00" + "time": "2024-12-12T09:58:10+00:00" } ], "packages-dev": [ @@ -3185,8 +3185,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -3263,8 +3263,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { diff --git a/php/containers.json b/php/containers.json index 173f1ed2..a6553039 100644 --- a/php/containers.json +++ b/php/containers.json @@ -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" @@ -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" @@ -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" diff --git a/php/templates/containers.twig b/php/templates/containers.twig index f00ab0da..08269747 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -17,7 +17,7 @@
-

Nextcloud AIO v10.1.0

+

Nextcloud AIO v10.1.1

{# Add 2nd tab warning #} diff --git a/readme.md b/readme.md index 9fbd16e5..1cc6a8dc 100644 --- a/readme.md +++ b/readme.md @@ -731,7 +731,7 @@ You might want to adjust the Nextcloud apps that are installed upon the first st ### How to add OS packages permanently to the Nextcloud container? Some Nextcloud apps require additional external dependencies that must be bundled within Nextcloud container in order to work correctly. As we cannot put each and every dependency for all apps into the container - as this would make the project quickly unmaintainable - there is an official way in which you can add additional dependencies into the Nextcloud container. However note that doing this is disrecommended since we do not test Nextcloud apps that require external dependencies. -You can do so by adding `--env NEXTCLOUD_ADDITIONAL_APKS="imagemagick dependency2 dependency3"` to the docker run command of the mastercontainer (but before the last line `nextcloud/all-in-one:latest`! If it was started already, you will need to stop the mastercontainer, remove it (no data will be lost) and recreate it using the docker run command that you initially used) and customize the value to your fitting. It must be a string with small letters a-z, digits 0-9, spaces, dots and hyphens or '_'. You can find available packages here: https://pkgs.alpinelinux.org/packages?branch=v3.20. By default `imagemagick` is added. If you want to keep it, you need to specify it as well. +You can do so by adding `--env NEXTCLOUD_ADDITIONAL_APKS="imagemagick dependency2 dependency3"` to the docker run command of the mastercontainer (but before the last line `nextcloud/all-in-one:latest`! If it was started already, you will need to stop the mastercontainer, remove it (no data will be lost) and recreate it using the docker run command that you initially used) and customize the value to your fitting. It must be a string with small letters a-z, digits 0-9, spaces, dots and hyphens or '_'. You can find available packages here: https://pkgs.alpinelinux.org/packages?branch=v3.21. By default `imagemagick` is added. If you want to keep it, you need to specify it as well. ### How to add PHP extensions permanently to the Nextcloud container? Some Nextcloud apps require additional php extensions that must be bundled within Nextcloud container in order to work correctly. As we cannot put each and every dependency for all apps into the container - as this would make the project quickly unmaintainable - there is an official way in which you can add additional php extensions into the Nextcloud container. However note that doing this is disrecommended since we do not test Nextcloud apps that require additional php extensions.