increase to 10.13.0

Signed-off-by: Simon L. <szaimen@e.mail.de>
Merge pull request #6311 from nextcloud/docker-socket-proxy-fix-for-agent
2026-05-22 03:10:16 +00:00 · 2025-04-17 17:31:00 +02:00 · 2025-04-17 13:39:38 +02:00 · 2025-04-17 12:00:57 +02:00 · 2025-04-17 11:58:51 +02:00 · 2025-04-17 10:58:23 +02:00
32 changed files with 54 additions and 73 deletions
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - uses: actions/checkout@v4
-    - uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2
+    - uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
      with:
        php-version: 8.3
        extensions: apcu
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -36,7 +36,7 @@ jobs:
        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
        with:
          php-version: ${{ matrix.php-versions }}
          coverage: none
--- a/.github/workflows/nextcloud-update.yml
+++ b/.github/workflows/nextcloud-update.yml
@@ -60,12 +60,6 @@ jobs:
        )"
        sed -i "s|\(pecl install[^;]*imagick-\)[0-9.]*|\1$imagick_version|" ./Containers/nextcloud/Dockerfile

-        # Imagick git-commit-hash from HEAD
-        imagick_commit_hash="$(
-          git ls-remote https://github.com/imagick/imagick.git HEAD | awk '{print $1}'
-        )"
-        sed -i "s/\(ARG IMAGICK_COMMIT_HASH=\)[a-fA-F0-9]*$/\1$imagick_commit_hash/" ./Containers/nextcloud/Dockerfile
-
        # Igbinary
        igbinary_version="$(
          git ls-remote --tags https://github.com/igbinary/igbinary.git \
--- a/.github/workflows/php-deprecation-detector.yml
+++ b/.github/workflows/php-deprecation-detector.yml
@@ -18,7 +18,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - name: Set up php
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
        with:
          php-version: 8.3
          extensions: apcu
--- a/.github/workflows/psalm-update-baseline.yml
+++ b/.github/workflows/psalm-update-baseline.yml
@@ -13,7 +13,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Set up php
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
        with:
          php-version: 8.3
          extensions: apcu
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -29,7 +29,7 @@ jobs:
        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Set up php
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
        with:
          php-version: 8.3
          extensions: apcu
--- a/.github/workflows/twig-lint.yml
+++ b/.github/workflows/twig-lint.yml
@@ -27,7 +27,7 @@ jobs:
        uses: actions/checkout@v4

      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
        with:
          php-version: 8.3
          extensions: apcu
--- a/Containers/borgbackup/backupscript.sh
+++ b/Containers/borgbackup/backupscript.sh
@@ -185,10 +185,7 @@ if [ "$BORG_MODE" = backup ]; then
    # Borg options
    # auto,zstd compression seems to has the best ratio based on:
    # https://forum.level1techs.com/t/optimal-compression-for-borg-backups/145870/6
-    BORG_OPTS=(-v --stats --compression "auto,zstd")
-    if [ "$NEW_REPOSITORY" = 1 ]; then
-        BORG_OPTS+=(--progress)
-    fi
+    BORG_OPTS=(-v --stats --compression "auto,zstd" --progress)

    # Exclude the nextcloud log and audit log for GDPR reasons
    BORG_EXCLUDE=(--exclude "/nextcloud_aio_volumes/nextcloud_aio_nextcloud/data/nextcloud.log*" --exclude "/nextcloud_aio_volumes/nextcloud_aio_nextcloud/data/audit.log" --exclude "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/lost+found")
--- a/Containers/collabora/Dockerfile
+++ b/Containers/collabora/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # From a file located probably somewhere here: https://github.com/CollaboraOnline/online/blob/master/docker/from-packages/Dockerfile
-FROM collabora/code:24.04.13.2.1
+FROM collabora/code:24.04.13.3.1

 USER root
 ARG DEBIAN_FRONTEND=noninteractive
--- a/Containers/docker-socket-proxy/haproxy.cfg
+++ b/Containers/docker-socket-proxy/haproxy.cfg
@@ -4,9 +4,9 @@ global
    maxconn 10

 defaults
-    timeout connect 10s
-    timeout client 10s
-    timeout server 10s
+    timeout connect 30s
+    timeout client 30s
+    timeout server 1800s

 frontend http
    mode http
@@ -14,6 +14,8 @@ frontend http
    http-request deny unless { src 127.0.0.1 } || { src ::1 } || { src NC_IPV4_PLACEHOLDER } || { src NC_IPV6_PLACEHOLDER }
    # docker system _ping
    http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/_ping$ } METH_GET
+    # docker inspect image: GET images/%s/json
+    http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/images/.*/json } METH_GET
    # container inspect: GET containers/%s/json
    http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers/nc_app_[a-zA-Z0-9_.-]+/json } METH_GET
    # container inspect: GET containers/%s/logs
--- a/Containers/fulltextsearch/Dockerfile
+++ b/Containers/fulltextsearch/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
-FROM elasticsearch:8.17.4
+FROM elasticsearch:8.18.0

 USER root

--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@@ -6,7 +6,7 @@ FROM docker:28.0.4-cli AS docker
 FROM caddy:2.9.1-alpine AS caddy

 # From https://github.com/docker-library/php/blob/master/8.3/alpine3.21/fpm/Dockerfile
-FROM php:8.3.19-fpm-alpine3.21
+FROM php:8.3.20-fpm-alpine3.21

 EXPOSE 80
 EXPOSE 8080
--- a/Containers/nextcloud/Dockerfile
+++ b/Containers/nextcloud/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM php:8.3.19-fpm-alpine3.21
+FROM php:8.3.20-fpm-alpine3.21

 ENV PHP_MEMORY_LIMIT=512M
 ENV PHP_UPLOAD_LIMIT=16G
@@ -8,14 +8,11 @@ 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.9
+ENV NEXTCLOUD_VERSION=30.0.10
 ENV AIO_TOKEN=123456
 ENV AIO_URL=localhost
 # AIO settings end # Do not remove or change this line!

-# Define the commit hash for imagick as a variable
-ARG IMAGICK_COMMIT_HASH=28f27044e435a2b203e32675e942eb8de620ee58
-
 COPY --chmod=775 *.sh /
 COPY --chmod=774 upgrade.exclude /upgrade.exclude
 COPY config/*.php /
@@ -85,20 +82,7 @@ RUN set -ex; \
    pecl install APCu-5.1.24; \
    pecl install -D 'enable-memcached-igbinary="yes"' memcached-3.3.0; \
    pecl install -oD 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' redis-6.2.0; \
-#    pecl install -o imagick-3.7.0; \
-# Begin workaround ->
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    apk add --no-cache --virtual .git-build-deps git \
-    && git clone https://github.com/imagick/imagick.git --depth 1 /tmp/imagick \
-    && cd /tmp/imagick \
-    && git fetch --depth 1 origin ${IMAGICK_COMMIT_HASH} \
-    && git checkout ${IMAGICK_COMMIT_HASH} \
-    && sed -i "s/@PACKAGE_VERSION@/git-${IMAGICK_COMMIT_HASH:0:7}/" php_imagick.h \
-    && phpize && ./configure && make && make install; \
-    apk del .git-build-deps; \
-    cd && rm -r /tmp/imagick; \
-# <- End workaround
+   pecl install -o imagick-3.8.0; \
    \
    docker-php-ext-enable \
        igbinary \
--- a/Containers/onlyoffice/Dockerfile
+++ b/Containers/onlyoffice/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # From https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/Dockerfile
-FROM onlyoffice/documentserver:8.3.2.1
+FROM onlyoffice/documentserver:8.3.3.1

 # USER root is probably used

--- 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.11.0
+version: 10.12.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
@@ -61,7 +61,7 @@ spec:
              value: "{{ .Values.TIMEZONE }}"
            - name: WHITEBOARD_HOST
              value: nextcloud-aio-whiteboard
-          image: ghcr.io/nextcloud-releases/aio-apache:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-apache:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
@@ -36,7 +36,7 @@ spec:
        {{- end }}
      initContainers:
        - name: init-subpath
-          image: ghcr.io/nextcloud-releases/aio-alpine:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-alpine:20250417_082355
          command:
            - mkdir
            - "-p"
@@ -59,7 +59,7 @@ spec:
              value: "{{ .Values.NEXTCLOUD_UPLOAD_LIMIT }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-clamav:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-clamav:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
@@ -35,7 +35,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 --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json --o:net.post_allow.host[0]=.+
            - name: server_name
              value: "{{ .Values.NC_DOMAIN }}"
-          image: ghcr.io/nextcloud-releases/aio-collabora:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-collabora:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
@@ -35,7 +35,7 @@ spec:
        {{- end }}
      initContainers:
        - name: init-subpath
-          image: ghcr.io/nextcloud-releases/aio-alpine:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-alpine:20250417_082355
          command:
            - mkdir
            - "-p"
@@ -64,7 +64,7 @@ spec:
              value: nextcloud
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-postgresql:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-postgresql:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      initContainers:
        - name: init-volumes
-          image: ghcr.io/nextcloud-releases/aio-alpine:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-alpine:20250417_082355
          command:
            - chmod
            - "777"
@@ -54,7 +54,7 @@ spec:
              value: basic
            - name: xpack.security.enabled
              value: "false"
-          image: ghcr.io/nextcloud-releases/aio-fulltextsearch:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-fulltextsearch:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
@@ -38,7 +38,7 @@ spec:
              value: "{{ .Values.IMAGINARY_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-imaginary:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-imaginary:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
@@ -38,7 +38,7 @@ spec:
 # AIO settings start # Do not remove or change this line!
      initContainers:
        - name: init-volumes
-          image: ghcr.io/nextcloud-releases/aio-alpine:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-alpine:20250417_082355
          command:
            - chmod
            - "777"
@@ -81,7 +81,7 @@ spec:
            - name: NEXTCLOUD_DEFAULT_QUOTA
              value: "{{ .Values.NEXTCLOUD_DEFAULT_QUOTA }}"
            - name: NEXTCLOUD_SKELETON_DIRECTORY
-              value: "{{ .Values.NEXTCLOUD_SKELETON_DIRECTORY | default "" }}"
+              value: "{{ .Values.NEXTCLOUD_SKELETON_DIRECTORY }}"
            - name: NEXTCLOUD_MAINTENANCE_WINDOW
              value: "{{ .Values.NEXTCLOUD_MAINTENANCE_WINDOW }}"
            - name: ADDITIONAL_APKS
@@ -182,7 +182,7 @@ spec:
              value: "{{ .Values.WHITEBOARD_ENABLED }}"
            - name: WHITEBOARD_SECRET
              value: "{{ .Values.WHITEBOARD_SECRET }}"
-          image: ghcr.io/nextcloud-releases/aio-nextcloud:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-nextcloud:20250417_082355
          {{- if eq (.Values.RPSS_ENABLED | default "no") "yes" }} # AIO-config - do not change this comment!
          securityContext:
            # The items below only work in container context
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
@@ -55,7 +55,7 @@ spec:
              value: "{{ .Values.REDIS_PASSWORD }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-notify-push:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-notify-push:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      initContainers:
        - name: init-volumes
-          image: ghcr.io/nextcloud-releases/aio-alpine:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-alpine:20250417_082355
          command:
            - chmod
            - "777"
@@ -42,7 +42,7 @@ spec:
              value: "{{ .Values.ONLYOFFICE_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-onlyoffice:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-onlyoffice:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
@@ -39,7 +39,7 @@ spec:
              value: "{{ .Values.REDIS_PASSWORD }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-redis:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-redis:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
@@ -52,7 +52,7 @@ spec:
              value: "{{ .Values.TURN_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-talk:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-talk:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml
@@ -44,7 +44,7 @@ spec:
              value: "{{ .Values.RECORDING_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-talk-recording:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-talk-recording:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-whiteboard-deployment.yaml
@@ -48,7 +48,7 @@ spec:
              value: redis
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: ghcr.io/nextcloud-releases/aio-whiteboard:20250408_081359
+          image: ghcr.io/nextcloud-releases/aio-whiteboard:20250417_082355
          readinessProbe:
            exec:
              command:
--- a/nextcloud-aio-helm-chart/update-helm.sh
+++ b/nextcloud-aio-helm-chart/update-helm.sh
@@ -303,7 +303,7 @@ cat << EOL > /tmp/additional.config
            - name: NEXTCLOUD_DEFAULT_QUOTA
              value: "{{ .Values.NEXTCLOUD_DEFAULT_QUOTA }}"
            - name: NEXTCLOUD_SKELETON_DIRECTORY
-              value: "{{ .Values.NEXTCLOUD_SKELETON_DIRECTORY | default "" }}"
+              value: "{{ .Values.NEXTCLOUD_SKELETON_DIRECTORY }}"
            - name: NEXTCLOUD_MAINTENANCE_WINDOW
              value: "{{ .Values.NEXTCLOUD_MAINTENANCE_WINDOW }}"
 EOL
--- a/php/composer.lock
+++ b/php/composer.lock
@@ -2580,16 +2580,16 @@
        },
        {
            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.6.1",
+            "version": "5.6.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8"
+                "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
-                "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/92dde6a5919e34835c506ac8c523ef095a95ed62",
+                "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62",
                "shasum": ""
            },
            "require": {
@@ -2638,9 +2638,9 @@
            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
            "support": {
                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.2"
            },
-            "time": "2024-12-07T09:39:29+00:00"
+            "time": "2025-04-13T19:20:35+00:00"
        },
        {
            "name": "phpdocumentor/type-resolver",
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -1030,8 +1030,8 @@ readonly class DockerActionManager {
        return false;
    }

-    private function GetCreatedTimeOfNextcloudImage(): ?string {
-        $imageName = 'nextcloud/aio-nextcloud' . ':' . $this->GetCurrentChannel();
+    private function GetCreatedTimeOfNextcloudImage(string $imageName): ?string {
+        $imageName = $imageName . ':' . $this->GetCurrentChannel();
        try {
            $imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $imageName));
            $imageOutput = json_decode($this->guzzleClient->get($imageUrl)->getBody()->getContents(), true);
@@ -1052,7 +1052,11 @@ readonly class DockerActionManager {
    }

    public function isNextcloudImageOutdated(): bool {
-        $createdTime = $this->GetCreatedTimeOfNextcloudImage();
+        $createdTime = $this->GetCreatedTimeOfNextcloudImage('ghcr.io/nextcloud-releases/aio-nextcloud');
+
+        if ($createdTime === null) {
+            $createdTime = $this->GetCreatedTimeOfNextcloudImage('nextcloud/aio-nextcloud');
+        }

        if ($createdTime === null) {
            return false;
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -17,7 +17,7 @@

    <div class="container">
        <main>
-            <h1>Nextcloud AIO v10.12.0</h1>
+            <h1>Nextcloud AIO v10.13.0</h1>

            {# Add 2nd tab warning #}
            <script type="text/javascript" src="second-tab-warning.js"></script>
Author	SHA1	Message	Date
Simon L.	0fc19bb19b	increase to 10.13.0 Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-04-17 17:31:00 +02:00
Simon L.	c8f942e834	Merge pull request #6311 from nextcloud/docker-socket-proxy-fix-for-agent Docker-socket-proxy: Update haproxy.cfg to fix timeouts	2025-04-17 13:39:38 +02:00
Simon L.	5c50af06e0	Merge pull request #6314 from nextcloud/enh/noid/update-30.0.10 nextcloud: update to 30.0.10	2025-04-17 12:00:57 +02:00
Simon L.	c8c150e4cd	nextcloud: update to 30.0.10 Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-04-17 11:58:51 +02:00
Simon L.	fe49c7873e	Merge pull request #6313 from nextcloud/aio-helm-update Helm Chart updates	2025-04-17 10:58:23 +02:00
szaimen	a68223265f	Helm Chart updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-04-17 08:54:49 +00:00
Bastian Derigs	3f1c2384b7	Update haproxy.cfg And since i forgott the 1800 and went with 30, 30, 30 here now the correct values. Signed-off-by: Bastian Derigs <155444921+derigs@users.noreply.github.com>	2025-04-17 10:49:38 +02:00
Simon L.	0696622ddc	Merge pull request #6312 from nextcloud/enh/5582/revert-workaround nextcloud: update imagick to 3.8.0 and revert imagick workaround	2025-04-17 10:47:59 +02:00
Simon L.	73197960c3	nextcloud: update imagick to 3.8.0 and revert imagick workaround Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-04-17 10:45:08 +02:00
Simon L.	137defad9b	Merge pull request #6291 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-24.04.13.3.1 build(deps): bump collabora/code from 24.04.13.2.1 to 24.04.13.3.1 in /Containers/collabora	2025-04-17 10:39:14 +02:00
Simon L.	47f0b75fcb	Merge pull request #6292 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.3.20-fpm-alpine3.21 build(deps): bump php from 8.3.19-fpm-alpine3.21 to 8.3.20-fpm-alpine3.21 in /Containers/mastercontainer	2025-04-17 10:39:01 +02:00
Simon L.	e0d16725d4	Merge pull request #6293 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.3.20-fpm-alpine3.21 build(deps): bump php from 8.3.19-fpm-alpine3.21 to 8.3.20-fpm-alpine3.21 in /Containers/nextcloud	2025-04-17 10:38:40 +02:00
Simon L.	307b0ab4ae	Merge pull request #6296 from nextcloud/aio-dependency-update PHP dependency updates	2025-04-17 10:38:27 +02:00
Simon L.	b8995a98a3	Merge pull request #6309 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.18.0 build(deps): bump elasticsearch from 8.17.4 to 8.18.0 in /Containers/fulltextsearch	2025-04-17 10:37:57 +02:00
Bastian Derigs	f4b5dbe005	Update haproxy.cfg Due to some testing its possible to install the agent via occ and the frontend by setting this on 60s. Lower values didn't work in my testing. Signed-off-by: Bastian Derigs <155444921+derigs@users.noreply.github.com>	2025-04-17 10:33:04 +02:00
Simon L.	6f47512c59	Merge pull request #6307 from nextcloud/enh/6301/borg-progress borgbackup: always use the progress option when creating an archive	2025-04-17 10:30:52 +02:00
Simon L.	8103aebb58	Merge pull request #6308 from nextcloud/feat/docker-socket-proxy/inspect-image-rule feat(docker-socket-proxy): allow inspect image rule	2025-04-17 10:30:33 +02:00
Simon L.	a7a5e849fa	Merge pull request #6303 from nextcloud/enh/6302/fix-outdated-notification DockerActionManager: fix Nextcloud is oudated notification	2025-04-17 10:30:00 +02:00
Simon L.	ed0365c597	update OO Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-04-17 10:29:18 +02:00
dependabot[bot]	7b60313eaa	build(deps): bump elasticsearch in /Containers/fulltextsearch Bumps elasticsearch from 8.17.4 to 8.18.0. --- updated-dependencies: - dependency-name: elasticsearch dependency-version: 8.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-17 04:42:14 +00:00
Andrey Borysenko	5b5f49b00b	feat: add image inspect rule Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>	2025-04-16 16:58:02 +03:00
Simon L.	1c4fa05601	Update update-helm.sh: remove some default Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-04-16 13:43:21 +02:00
Simon L.	a47be369e9	borgbackup: always use the progress option when creating an archive Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-04-16 11:49:21 +02:00
Simon L.	da0c3acb05	Merge pull request #6304 from nextcloud/dependabot/github_actions/dot-github/workflows/shivammathur/setup-php-2.33.0 build(deps): bump shivammathur/setup-php from 2.32.0 to 2.33.0 in /.github/workflows	2025-04-15 16:20:02 +02:00
dependabot[bot]	0ec6fd1117	build(deps): bump shivammathur/setup-php in /.github/workflows Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.32.0 to 2.33.0. - [Release notes](https://github.com/shivammathur/setup-php/releases) - [Commits](`9e72090525...cf4cade272`) --- updated-dependencies: - dependency-name: shivammathur/setup-php dependency-version: 2.33.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-15 13:13:35 +00:00
Simon L.	0c76d14fcb	DockerActionManager: fix Nextcloud is oudated notification Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-04-15 14:56:16 +02:00
szaimen	3146735cc0	php dependency updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-04-14 12:03:23 +00:00
dependabot[bot]	0508331fb4	build(deps): bump php in /Containers/nextcloud Bumps php from 8.3.19-fpm-alpine3.21 to 8.3.20-fpm-alpine3.21. --- updated-dependencies: - dependency-name: php dependency-version: 8.3.20-fpm-alpine3.21 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-14 04:27:47 +00:00
dependabot[bot]	d55b13f974	build(deps): bump php in /Containers/mastercontainer Bumps php from 8.3.19-fpm-alpine3.21 to 8.3.20-fpm-alpine3.21. --- updated-dependencies: - dependency-name: php dependency-version: 8.3.20-fpm-alpine3.21 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-14 04:27:32 +00:00
dependabot[bot]	0a5fecad4b	build(deps): bump collabora/code in /Containers/collabora Bumps collabora/code from 24.04.13.2.1 to 24.04.13.3.1. --- updated-dependencies: - dependency-name: collabora/code dependency-version: 24.04.13.3.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-14 04:27:02 +00:00