increase to 7.11.2

Signed-off-by: Simon L <szaimen@e.mail.de>
Merge pull request #4119 from nextcloud/enh/noid/downgrade-nc
2026-05-21 19:00:33 +00:00 · 2024-01-29 09:38:09 +01:00 · 2024-01-29 09:36:26 +01:00 · 2024-01-29 09:36:16 +01:00 · 2024-01-29 09:34:26 +01:00 · 2024-01-26 09:28:43 +01:00
41 changed files with 85 additions and 78 deletions
--- a/.github/workflows/command-rebase.yml
+++ b/.github/workflows/command-rebase.yml
@@ -23,7 +23,7 @@ jobs:

    steps:
      - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
          repository: ${{ github.event.repository.full_name }}
@@ -42,7 +42,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}

      - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
        if: failure()
        with:
          token: ${{ secrets.COMMAND_BOT_PAT }}
--- a/Containers/clamav/Dockerfile
+++ b/Containers/clamav/Dockerfile
@@ -1,5 +1,5 @@
 # Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile
-FROM clamav/clamav:1.2.1-26
+FROM clamav/clamav:1.2.1-27

 COPY clamav.conf /tmp/clamav.conf

--- a/Containers/collabora/Dockerfile
+++ b/Containers/collabora/Dockerfile
@@ -1,5 +1,5 @@
 # From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
-FROM collabora/code:23.05.7.2.1
+FROM collabora/code:23.05.7.5.1

 USER root

--- a/Containers/fulltextsearch/Dockerfile
+++ b/Containers/fulltextsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
-FROM elasticsearch:8.11.3
+FROM elasticsearch:8.12.0

 USER root

--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@@ -5,7 +5,7 @@ FROM docker:24.0.7-cli as docker
 FROM caddy:2.7.6-alpine as caddy

 # From https://github.com/docker-library/php/blob/master/8.2/alpine3.18/fpm/Dockerfile
-FROM php:8.2.14-fpm-alpine3.18
+FROM php:8.2.15-fpm-alpine3.18

 EXPOSE 80
 EXPOSE 8080
--- a/manual-install/update-yaml.sh
+++ b/manual-install/update-yaml.sh
@@ -40,6 +40,7 @@ sed -i 's|- ip_binding: |- |' containers.yml
 sed -i '/AIO_TOKEN/d' containers.yml
 sed -i '/AIO_URL/d' containers.yml
 sed -i '/DOCKER_SOCKET_PROXY_ENABLED/d' containers.yml
+sed -i '/ADDITIONAL_TRUSTED_PROXY/d' containers.yml

 TCP="$(grep -oP '[%A-Z0-9_]+/tcp' containers.yml | sort -u)"
 mapfile -t TCP <<< "$TCP"
--- 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: 7.10.0
+version: 7.11.0
 apiVersion: v2
 keywords:
  - latest
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-apache
  name: nextcloud-aio-apache
@@ -17,7 +17,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-apache
@@ -57,7 +57,7 @@ spec:
              value: nextcloud-aio-talk
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-apache:20240117_083657-latest
+          image: nextcloud/aio-apache:20240124_105749-latest
          name: nextcloud-aio-apache
          ports:
            - containerPort: {{ .Values.APACHE_PORT }}
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-apache
  name: nextcloud-aio-apache
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-clamav
  name: nextcloud-aio-clamav
@@ -18,7 +18,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-clamav
@@ -50,7 +50,7 @@ spec:
              value: "90"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-clamav:20240117_083657-latest
+          image: nextcloud/aio-clamav:20240124_105749-latest
          name: nextcloud-aio-clamav
          ports:
            - containerPort: 3310
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-clamav
  name: nextcloud-aio-clamav
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-collabora
  name: nextcloud-aio-collabora
@@ -18,7 +18,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-collabora
@@ -37,7 +37,7 @@ spec:
              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
            - name: server_name
              value: "{{ .Values.NC_DOMAIN }}"
-          image: nextcloud/aio-collabora:20240117_083657-latest
+          image: nextcloud/aio-collabora:20240124_105749-latest
          name: nextcloud-aio-collabora
          ports:
            - containerPort: 9980
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-collabora
  name: nextcloud-aio-collabora
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-database
  name: nextcloud-aio-database
@@ -17,7 +17,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-database
@@ -61,7 +61,7 @@ spec:
              value: nextcloud
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-postgresql:20240117_083657-latest
+          image: nextcloud/aio-postgresql:20240124_105749-latest
          name: nextcloud-aio-database
          ports:
            - containerPort: 5432
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-database
  name: nextcloud-aio-database
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-fulltextsearch
  name: nextcloud-aio-fulltextsearch
@@ -18,7 +18,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-fulltextsearch
@@ -55,7 +55,7 @@ spec:
              value: basic
            - name: xpack.security.enabled
              value: "false"
-          image: nextcloud/aio-fulltextsearch:20240117_083657-latest
+          image: nextcloud/aio-fulltextsearch:20240124_105749-latest
          name: nextcloud-aio-fulltextsearch
          ports:
            - containerPort: 9200
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-fulltextsearch
  name: nextcloud-aio-fulltextsearch
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-imaginary
  name: nextcloud-aio-imaginary
@@ -18,7 +18,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-imaginary
@@ -27,7 +27,7 @@ spec:
        - env:
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-imaginary:20240117_083657-latest
+          image: nextcloud/aio-imaginary:20240124_105749-latest
          name: nextcloud-aio-imaginary
          ports:
            - containerPort: 9000
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-imaginary
  name: nextcloud-aio-imaginary
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-namespace-namespace.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-namespace-namespace.yaml
@@ -3,4 +3,3 @@ kind: Namespace
 metadata:
  name: {{ .Values.NAMESPACE }}
  namespace: {{ .Values.NAMESPACE }}
-spec: {}
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-nextcloud
  name: nextcloud-aio-nextcloud
@@ -17,7 +17,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-nextcloud
@@ -158,7 +158,7 @@ spec:
              value: "{{ .Values.TIMEZONE }}"
            - name: UPDATE_NEXTCLOUD_APPS
              value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
-          image: nextcloud/aio-nextcloud:20240117_083657-latest
+          image: nextcloud/aio-nextcloud:20240124_105749-latest
          name: nextcloud-aio-nextcloud
          ports:
            - containerPort: 9000
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-nextcloud
  name: nextcloud-aio-nextcloud
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-notify-push
  name: nextcloud-aio-notify-push
@@ -17,7 +17,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-notify-push
@@ -50,7 +50,7 @@ spec:
              value: nextcloud-aio-redis
            - name: REDIS_HOST_PASSWORD
              value: "{{ .Values.REDIS_PASSWORD }}"
-          image: nextcloud/aio-notify-push:20240117_083657-latest
+          image: nextcloud/aio-notify-push:20240124_105749-latest
          name: nextcloud-aio-notify-push
          ports:
            - containerPort: 7867
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-notify-push
  name: nextcloud-aio-notify-push
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-onlyoffice
  name: nextcloud-aio-onlyoffice
@@ -18,7 +18,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-onlyoffice
@@ -43,7 +43,7 @@ spec:
              value: "{{ .Values.ONLYOFFICE_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-onlyoffice:20240117_083657-latest
+          image: nextcloud/aio-onlyoffice:20240124_105749-latest
          name: nextcloud-aio-onlyoffice
          ports:
            - containerPort: 80
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-onlyoffice
  name: nextcloud-aio-onlyoffice
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-redis
  name: nextcloud-aio-redis
@@ -17,7 +17,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-redis
@@ -38,7 +38,7 @@ spec:
              value: "{{ .Values.REDIS_PASSWORD }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-redis:20240117_083657-latest
+          image: nextcloud/aio-redis:20240124_105749-latest
          name: nextcloud-aio-redis
          ports:
            - containerPort: 6379
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-redis
  name: nextcloud-aio-redis
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-talk
  name: nextcloud-aio-talk
@@ -18,7 +18,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-talk
@@ -37,7 +37,7 @@ spec:
              value: "{{ .Values.TURN_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-talk:20240117_083657-latest
+          image: nextcloud/aio-talk:20240124_105749-latest
          name: nextcloud-aio-talk
          ports:
            - containerPort: {{ .Values.TALK_PORT }}
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-talk-recording
  name: nextcloud-aio-talk-recording
@@ -18,7 +18,7 @@ spec:
    metadata:
      annotations:
        kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-        kompose.version: 1.31.2 (a92241f79)
+        kompose.version: 1.32.0 (765fde254)
      labels:
        io.kompose.network/nextcloud-aio: "true"
        io.kompose.service: nextcloud-aio-talk-recording
@@ -33,7 +33,7 @@ spec:
              value: "{{ .Values.RECORDING_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-talk-recording:20240117_083657-latest
+          image: nextcloud/aio-talk-recording:20240124_105749-latest
          name: nextcloud-aio-talk-recording
          ports:
            - containerPort: 1234
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-talk-recording
  name: nextcloud-aio-talk-recording
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml
@@ -5,7 +5,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-talk
  name: nextcloud-aio-talk-public
@@ -30,7 +30,7 @@ kind: Service
 metadata:
  annotations:
    kompose.cmd: kompose convert -c -f latest.yml --namespace {{ .Values.NAMESPACE }}
-    kompose.version: 1.31.2 (a92241f79)
+    kompose.version: 1.32.0 (765fde254)
  labels:
    io.kompose.service: nextcloud-aio-talk
  name: nextcloud-aio-talk
--- a/php/composer.json
+++ b/php/composer.json
@@ -19,7 +19,7 @@
        "ext-apcu": "*"
    },
    "scripts": {
-		"psalm": "psalm --threads=1 --show-info=true",
+		"psalm": "psalm --threads=1",
 		"psalm:update-baseline": "psalm --threads=1 --update-baseline",
 		"lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l {} \\;",
 		"php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.2 \\;"
--- a/php/composer.lock
+++ b/php/composer.lock
@@ -1090,16 +1090,16 @@
        },
        {
            "name": "slim/csrf",
-            "version": "1.3.0",
+            "version": "1.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/slimphp/Slim-Csrf.git",
-                "reference": "ebaaf295fd6d7224078d8ae3bba45329b31798c7"
+                "reference": "f66be9740283ed4f432535aff3623540e178013a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim-Csrf/zipball/ebaaf295fd6d7224078d8ae3bba45329b31798c7",
-                "reference": "ebaaf295fd6d7224078d8ae3bba45329b31798c7",
+                "url": "https://api.github.com/repos/slimphp/Slim-Csrf/zipball/f66be9740283ed4f432535aff3623540e178013a",
+                "reference": "f66be9740283ed4f432535aff3623540e178013a",
                "shasum": ""
            },
            "require": {
@@ -1110,10 +1110,10 @@
                "psr/http-server-middleware": "^1.0"
            },
            "require-dev": {
-                "phpspec/prophecy": "^1.15",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5",
-                "squizlabs/php_codesniffer": "^3.7"
+                "phpspec/prophecy": "^1.18",
+                "phpspec/prophecy-phpunit": "^2.1",
+                "phpunit/phpunit": "^9.6",
+                "squizlabs/php_codesniffer": "^3.8"
            },
            "type": "library",
            "autoload": {
@@ -1142,9 +1142,9 @@
            ],
            "support": {
                "issues": "https://github.com/slimphp/Slim-Csrf/issues",
-                "source": "https://github.com/slimphp/Slim-Csrf/tree/1.3.0"
+                "source": "https://github.com/slimphp/Slim-Csrf/tree/1.4.0"
            },
-            "time": "2022-11-05T19:27:53+00:00"
+            "time": "2024-01-22T09:08:27+00:00"
        },
        {
            "name": "slim/slim",
--- a/php/containers.json
+++ b/php/containers.json
@@ -213,6 +213,7 @@
        "REMOVE_DISABLED_APPS=%REMOVE_DISABLED_APPS%",
        "APACHE_PORT=%APACHE_PORT%",
        "APACHE_IP_BINDING=%APACHE_IP_BINDING%",
+        "ADDITIONAL_TRUSTED_PROXY=%CADDY_IP_ADDRESS%",
        "THIS_IS_AIO=true"
      ],
      "stop_grace_period": 600,
--- a/php/domain-validator.php
+++ b/php/domain-validator.php
@@ -8,7 +8,7 @@ if (strpos($domain, '.') === false) {
    http_response_code(400);  
 } elseif (strpos($domain, ':') !== false) { 
    http_response_code(400);  
-} elseif (!filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { 
+} elseif (filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) === false) { 
    http_response_code(400); 
 } elseif (filter_var($domain, FILTER_VALIDATE_IP)) { 
    http_response_code(400); 
--- a/php/psalm-baseline.xml
+++ b/php/psalm-baseline.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.19.0@06b71be009a6bd6d81b9811855d6629b9fe90e1b"/>
+<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4"/>
--- a/php/src/Controller/LoginController.php
+++ b/php/src/Controller/LoginController.php
@@ -30,7 +30,7 @@ class LoginController
            return $response->withHeader('Location', '/')->withStatus(201);
        }

-        $response->getBody()->write("The password is false.");
+        $response->getBody()->write("The password is incorrect.");
        return $response->withHeader('Location', '/')->withStatus(422);
    }

--- a/php/src/Data/ConfigurationManager.php
+++ b/php/src/Data/ConfigurationManager.php
@@ -286,7 +286,7 @@ class ConfigurationManager
        }

        // Validate domain
-        if (!filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
+        if (filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) === false) {
            throw new InvalidSettingConfigurationException("Domain is not a valid domain!");
        }

@@ -305,7 +305,7 @@ class ConfigurationManager

            if (empty($dnsRecordIP)) {
                $record = dns_get_record($domain, DNS_AAAA);
-                if (!empty($record)) {
+                if (!empty($record[0]['ipv6'])) {
                    $dnsRecordIP = $record[0]['ipv6'];
                }
            }
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -406,6 +406,13 @@ class DockerActionManager
                // Allow to get local ip-address of database container which allows to talk to it even in host mode (the container that requires this needs to be started first then)
                } elseif ($out[1] === 'AIO_DATABASE_HOST') {
                    $replacements[1] = gethostbyname('nextcloud-aio-database');
+                // Allow to get local ip-address of caddy container and add it to trusted proxies automatically
+                } elseif ($out[1] === 'CADDY_IP_ADDRESS') {
+                    $replacements[1] = '';
+                    $communityContainers = $this->configurationManager->GetEnabledCommunityContainers();
+                    if (in_array('caddy', $communityContainers, true)) {
+                        $replacements[1] = gethostbyname('nextcloud-aio-caddy');
+                    }
                } else {
                    $secret = $this->configurationManager->GetSecret($out[1]);
                    if ($secret === "") {
@@ -518,12 +525,11 @@ class DockerActionManager
            $requestBody['HostConfig']['CapDrop'] = ['NET_RAW'];
        }

-        if ($container->isApparmorUnconfined()) {
-            $requestBody['HostConfig']['SecurityOpt'] = ["apparmor:unconfined"];
-        }
-
        // Disable SELinux for AIO containers so that it does not break them
        $requestBody['HostConfig']['SecurityOpt'] = ["label:disable"];
+        if ($container->isApparmorUnconfined()) {
+            $requestBody['HostConfig']['SecurityOpt'] = ["apparmor:unconfined", "label:disable"];
+        }

        $mounts = [];

--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -16,7 +16,7 @@
    </header>

    <div class="content">
-        <h1>Nextcloud AIO v7.11.0</h1>
+        <h1>Nextcloud AIO v7.11.2</h1>

        {# Add 2nd tab warning #}
        <script type="text/javascript" src="second-tab-warning.js"></script>
Author	SHA1	Message	Date
Simon L	a9c1c5fe11	increase to 7.11.2 Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-29 09:38:09 +01:00
Simon L	7e24002e6d	Merge pull request #4119 from nextcloud/enh/noid/downgrade-nc downgrade back to 27.1.5	2024-01-29 09:36:26 +01:00
Simon L	b079c4690f	Merge pull request #4130 from nextcloud/enh/4124/fix-borg fix borg backup restore not working anymore	2024-01-29 09:36:16 +01:00
Simon L	ca1b736cf7	fix borg backup restore not working anymore Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-29 09:34:26 +01:00
Simon L	c5b5300e9c	Merge pull request #4114 from nextcloud/dependabot/github_actions/peter-evans/create-or-update-comment-4.0.0 Bump peter-evans/create-or-update-comment from 3.1.0 to 4.0.0	2024-01-26 09:28:43 +01:00
Simon L	c991fe55ce	downgrade back to 27.1.5 Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-26 09:23:55 +01:00
dependabot[bot]	d1804260b3	Bump peter-evans/create-or-update-comment from 3.1.0 to 4.0.0 Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 3.1.0 to 4.0.0. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](`23ff15729e...71345be026`) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-25 12:56:12 +00:00
Simon L	1cce2e535f	fix filter_var syntax for domain-validator Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-25 12:17:43 +01:00
Simon L	2aa4b4aa11	increase to 7.11.1 Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-25 12:04:26 +01:00
Simon L	9dff8f756c	Merge pull request #4113 from nextcloud/enh/noid/update-nc nextcloud - update to 27.1.6	2024-01-25 12:03:35 +01:00
Simon L	f2b661dc91	nextcloud - update to 27.1.6 Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-25 12:01:43 +01:00
Simon L	35e62f2f0d	Merge pull request #4111 from nextcloud/enh/noid/add-caddy-ip allow to add nextcloud-aio-caddy ip-address to trusted proxies automatically	2024-01-25 12:01:05 +01:00
Simon L	1c8e46708f	allow to add nextcloud-aio-caddy ip-address to trusted proxies automatically Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-24 15:28:34 +01:00
Simon L	488a77ebdf	Merge pull request #4110 from nextcloud/aio-helm-update Helm Chart updates	2024-01-24 13:23:47 +01:00
szaimen	1b4a00735c	Helm Chart updates Signed-off-by: GitHub <noreply@github.com>	2024-01-24 12:09:20 +00:00
Simon L	27e8fc9092	Merge pull request #4090 from nextcloud/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml	2024-01-24 12:20:31 +01:00
Simon L	b4a380c1b2	try to fix psalm Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-24 12:18:49 +01:00
Simon L	378fe1d313	Merge pull request #4104 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.2.15-fpm-alpine3.18 Bump php from 8.2.14-fpm-alpine3.18 to 8.2.15-fpm-alpine3.18 in /Containers/mastercontainer	2024-01-24 12:02:05 +01:00
Simon L	101e165720	Merge pull request #4102 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.2.1-27 Bump clamav/clamav from 1.2.1-26 to 1.2.1-27 in /Containers/clamav	2024-01-24 12:01:52 +01:00
Simon L	3d6dae0093	Merge pull request #4100 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.7.5.1 Bump collabora/code from 23.05.7.2.1 to 23.05.7.5.1 in /Containers/collabora	2024-01-24 12:01:31 +01:00
Simon L	17ec79f33e	Merge pull request #4098 from nextcloud/aio-dependency-update PHP dependency updates	2024-01-24 12:01:15 +01:00
Simon L	03c7051c9a	Merge pull request #4083 from nextcloud/reword-error-message Reword the error message shown when the password is incorrect	2024-01-24 12:00:37 +01:00
Simon L	977f1d1d90	Merge pull request #4082 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.12.0 Bump elasticsearch from 8.11.3 to 8.12.0 in /Containers/fulltextsearch	2024-01-24 12:00:15 +01:00
dependabot[bot]	ad7248358c	Bump php in /Containers/mastercontainer Bumps php from 8.2.14-fpm-alpine3.18 to 8.2.15-fpm-alpine3.18. --- updated-dependencies: - dependency-name: php dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-22 13:04:07 +00:00
dependabot[bot]	11b1ecbd30	Bump clamav/clamav from 1.2.1-26 to 1.2.1-27 in /Containers/clamav Bumps clamav/clamav from 1.2.1-26 to 1.2.1-27. --- updated-dependencies: - dependency-name: clamav/clamav dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-22 12:35:50 +00:00
dependabot[bot]	85d5b6890d	Bump collabora/code in /Containers/collabora Bumps collabora/code from 23.05.7.2.1 to 23.05.7.5.1. --- updated-dependencies: - dependency-name: collabora/code dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-22 12:20:41 +00:00
szaimen	5303ff2927	php dependency updates Signed-off-by: GitHub <noreply@github.com>	2024-01-22 12:03:03 +00:00
nextcloud-command	c2bfe1d37d	Update psalm baseline Signed-off-by: GitHub <noreply@github.com>	2024-01-20 21:57:51 +00:00
hunhejj	5ec3fd2d3d	Reword the error message shown when the password is incorrect Signed-off-by: hunhejj <hunhejj@gmail.com>	2024-01-19 14:41:22 +01:00
Simon L	b17561d41e	remove show-info for psalm again Signed-off-by: Simon L <szaimen@e.mail.de>	2024-01-19 14:40:49 +01:00
dependabot[bot]	a6727c629a	Bump elasticsearch from 8.11.3 to 8.12.0 in /Containers/fulltextsearch Bumps elasticsearch from 8.11.3 to 8.12.0. --- updated-dependencies: - dependency-name: elasticsearch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-19 12:09:55 +00:00