Merge pull request #3043 from nextcloud/aio-helm-update

Helm Chart updates
Merge pull request #3000 from nextcloud/enh/noid/allow-configure-hpb-domain
2026-05-22 19:30:11 +00:00 · 2023-07-28 11:41:17 +02:00 · 2023-07-28 11:39:13 +02:00 · 2023-07-28 11:37:59 +02:00 · 2023-07-28 11:36:50 +02:00 · 2023-07-28 11:36:02 +02:00
27 changed files with 118 additions and 75 deletions
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -46,10 +46,10 @@ jobs:
    - name: Create Pull Request
      uses: peter-evans/create-pull-request@v5
      with:
-        commit-message: dependency updates
+        commit-message: php dependency updates
        signoff: true
-        title: Dependency updates
-        body: Automated dependency updates since dependabot does not support grouped updates
+        title: PHP dependency updates
+        body: Automated php dependency updates since dependabot does not support grouped updates
        labels: dependencies, 3. to review
        milestone: next
        branch: aio-dependency-update
--- a/.github/workflows/helm-release.yml
+++ b/.github/workflows/helm-release.yml
@@ -46,4 +46,3 @@ jobs:
          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
          CR_RELEASE_NAME_TEMPLATE: "helm-chart-{{ .Version }}"
          CR_SKIP_EXISTING: true
-          CR_GENERATE_RELEASE_NOTES: true
--- 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.1.3.1
+FROM collabora/code:23.05.2.2.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.8.0
+FROM elasticsearch:8.8.1

 USER root

--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@@ -1,5 +1,5 @@
 # Docker CLI is a requirement
-FROM docker:24.0.4-cli as docker
+FROM docker:24.0.5-cli as docker

 # Caddy is a requirement
 FROM caddy:2.6.4-alpine as caddy
--- a/Containers/nextcloud/config/postgresql.php
+++ b/Containers/nextcloud/config/postgresql.php
@@ -0,0 +1,7 @@
+<?php
+$CONFIG = array (
+    'dbuser' => 'oc_' . getenv('POSTGRES_USER'),
+    'dbpassword' => getenv('POSTGRES_PASSWORD'),
+    'db_name' => getenv('POSTGRES_DB'),
+    'dbpersistent' => true,
+);
--- a/Containers/nextcloud/start.sh
+++ b/Containers/nextcloud/start.sh
@@ -6,23 +6,13 @@ while ! sudo -u www-data nc -z "$POSTGRES_HOST" 5432; do
    sleep 5
 done

-# Use the correct Postgres username
-POSTGRES_USER="oc_$POSTGRES_USER"
-export POSTGRES_USER
-
-# Fix false database connection on old instances
+# Wait for database to actually start
 if [ -f "/var/www/html/config/config.php" ]; then
    sleep 2
    while ! sudo -u www-data psql -d "postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_DB" -c "select now()"; do
        echo "Waiting for the database to start..."
        sleep 5
    done
-    if [ "$POSTGRES_USER" = "oc_nextcloud" ] && [ "$POSTGRES_DB" = "nextcloud_database" ] && echo "$POSTGRES_PASSWORD" | grep -q '^[a-z0-9]\+$'; then
-        # This was introduced with https://github.com/nextcloud/all-in-one/pull/218
-        sed -i "s|'dbuser'.*=>.*$|'dbuser' => '$POSTGRES_USER',|" /var/www/html/config/config.php
-        sed -i "s|'dbpassword'.*=>.*$|'dbpassword' => '$POSTGRES_PASSWORD',|" /var/www/html/config/config.php
-        sed -i "s|'db_name'.*=>.*$|'db_name' => '$POSTGRES_DB',|" /var/www/html/config/config.php
-    fi
 fi

 # Trust additional Cacerts, if the user provided $TRUSTED_CACERTS_DIR
--- a/Containers/talk-recording/start.sh
+++ b/Containers/talk-recording/start.sh
@@ -12,6 +12,10 @@ elif [ -z "$INTERNAL_SECRET" ]; then
    exit 1
 fi

+if [ -z "$HPB_DOMAIN" ]; then
+    export HPB_DOMAIN="$NC_DOMAIN"
+fi
+
 cat << RECORDING_CONF > "/conf/recording.conf"
 [logs]
 # 30 means Warning
@@ -40,7 +44,7 @@ skipverify = ${SKIP_VERIFY}
 signalings = signaling-1

 [signaling-1]
-url = ${HPB_PROTOCOL}://${NC_DOMAIN}${HPB_PATH}
+url = ${HPB_PROTOCOL}://${HPB_DOMAIN}${HPB_PATH}
 internalsecret = ${INTERNAL_SECRET}

 [ffmpeg]
--- a/Containers/talk/Dockerfile
+++ b/Containers/talk/Dockerfile
@@ -1,4 +1,4 @@
-FROM nats:2.9.19-scratch as nats
+FROM nats:2.9.20-scratch as nats
 FROM strukturag/nextcloud-spreed-signaling:1.1.3 as signaling
 FROM alpine:3.18.2 as janus

@@ -21,11 +21,12 @@ RUN set -ex; \
        libnice-dev \
        libconfig-dev \
        libsrtp-dev \
+        libusrsctp-dev \
        gengetopt-dev \
        libwebsockets-dev; \
    git clone --recursive https://github.com/meetecho/janus-gateway --depth=1 --single-branch --branch "$JANUS_VERSION" /src; \
    /src/autogen.sh; \
-    /src/configure; \
+    /src/configure --disable-rabbitmq --disable-mqtt --disable-boringssl; \
    make; \
    make install; \
    make configs; \
@@ -52,6 +53,7 @@ RUN set -ex; \
        libnice \
        libconfig \
        libsrtp \
+        libusrsctp \
        libwebsockets \
        \
        shadow; \
--- a/manual-install/latest.yml
+++ b/manual-install/latest.yml
@@ -118,6 +118,8 @@ services:
    restart: unless-stopped
    networks:
      - nextcloud-aio
+    tmpfs:
+      - /tmp

  nextcloud-aio-notify-push:
    image: nextcloud/aio-notify-push:latest
@@ -278,9 +280,14 @@ services:
      - "9200"
    environment:
      - TZ=${TIMEZONE}
+      - ES_JAVA_OPTS=-Xms512M -Xmx512M
+      - bootstrap.memory_lock=true
+      - cluster.name=nextcloud-aio
      - discovery.type=single-node
-      - ES_JAVA_OPTS=-Xms1024M -Xmx1024M
-      - POSTGRES_HOST=nextcloud-aio-database
+      - logger.org.elasticsearch.discovery=WARN
+      - http.port=9200
+      - xpack.license.self_generated.type=basic
+      - xpack.security.enabled=false
    volumes:
      - nextcloud_aio_elasticsearch:/usr/share/elasticsearch/data:rw
    restart: unless-stopped
--- a/manual-upgrade.md
+++ b/manual-upgrade.md
@@ -12,7 +12,7 @@ The only way to fix this on your side is upgrading regularly (e.g. by enabling d
 1. Run the following commands in order to reverse engineer the Nextcloud container:
    ```bash
        sudo docker pull assaflavie/runlike
-        echo '#/bin/bash' > /tmp/nextcloud-aio-nextcloud
+        echo '#!/bin/bash' > /tmp/nextcloud-aio-nextcloud
        sudo docker run --rm -v /var/run/docker.sock:/var/run/docker.sock assaflavie/runlike -p nextcloud-aio-nextcloud >> /tmp/nextcloud-aio-nextcloud
        sudo chown root:root /tmp/nextcloud-aio-nextcloud
    ```
--- 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: 6.3.0
+version: 6.4.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
@@ -72,7 +72,7 @@ spec:
              value: nextcloud-aio-talk
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-apache:20230720_134150-latest
+          image: nextcloud/aio-apache:20230728_085937-latest
          name: nextcloud-aio-apache
          ports:
            - containerPort: {{ .Values.APACHE_PORT }}
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
@@ -48,7 +48,7 @@ spec:
              value: "90"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-clamav:20230720_134150-latest
+          image: nextcloud/aio-clamav:20230728_085937-latest
          name: nextcloud-aio-clamav
          ports:
            - containerPort: 3310
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
@@ -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:20230720_134150-latest
+          image: nextcloud/aio-collabora:20230728_085937-latest
          name: nextcloud-aio-collabora
          ports:
            - containerPort: 9980
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
@@ -67,7 +67,7 @@ spec:
              value: nextcloud
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-postgresql:20230720_134150-latest
+          image: nextcloud/aio-postgresql:20230728_085937-latest
          name: nextcloud-aio-database
          ports:
            - containerPort: 5432
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
@@ -36,14 +36,24 @@ spec:
      containers:
        - env:
            - name: ES_JAVA_OPTS
-              value: -Xms1024M -Xmx1024M
-            - name: POSTGRES_HOST
-              value: nextcloud-aio-database
+              value: -Xms512M -Xmx512M
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
+            - name: bootstrap.memory_lock
+              value: "true"
+            - name: cluster.name
+              value: nextcloud-aio
            - name: discovery.type
              value: single-node
-          image: nextcloud/aio-fulltextsearch:20230720_134150-latest
+            - name: http.port
+              value: "9200"
+            - name: logger.org.elasticsearch.discovery
+              value: WARN
+            - name: xpack.license.self_generated.type
+              value: basic
+            - name: xpack.security.enabled
+              value: "false"
+          image: nextcloud/aio-fulltextsearch:20230728_085937-latest
          name: nextcloud-aio-fulltextsearch
          ports:
            - containerPort: 9200
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
@@ -37,7 +37,7 @@ spec:
        - env:
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-imaginary:20230720_134150-latest
+          image: nextcloud/aio-imaginary:20230728_085937-latest
          name: nextcloud-aio-imaginary
          ports:
            - containerPort: 9000
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
@@ -30,7 +30,10 @@ spec:
            - "777"
            - /nextcloud-aio-nextcloud
            - /nextcloud-aio-nextcloud-trusted-cacerts
+            - /nextcloud-aio-nextcloud-tmpfs0
          volumeMounts:
+            - name: nextcloud-aio-nextcloud-tmpfs0
+              mountPath: /nextcloud-aio-nextcloud-tmpfs0
            - name: nextcloud-aio-nextcloud-trusted-cacerts
              mountPath: /nextcloud-aio-nextcloud-trusted-cacerts
            - name: nextcloud-aio-nextcloud
@@ -117,7 +120,7 @@ spec:
              value: "{{ .Values.TIMEZONE }}"
            - name: UPDATE_NEXTCLOUD_APPS
              value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
-          image: nextcloud/aio-nextcloud:20230720_134150-latest
+          image: nextcloud/aio-nextcloud:20230728_085937-latest
          name: nextcloud-aio-nextcloud
          ports:
            - containerPort: 9000
@@ -131,6 +134,8 @@ spec:
            - mountPath: /usr/local/share/ca-certificates
              name: nextcloud-aio-nextcloud-trusted-cacerts
              readOnly: true
+            - mountPath: /tmp
+              name: nextcloud-aio-nextcloud-tmpfs0
      volumes:
        - name: nextcloud-aio-nextcloud
          persistentVolumeClaim:
@@ -141,3 +146,5 @@ spec:
        - name: nextcloud-aio-nextcloud-trusted-cacerts
          persistentVolumeClaim:
            claimName: nextcloud-aio-nextcloud-trusted-cacerts
+        - emptyDir: {}
+          name: nextcloud-aio-nextcloud-tmpfs0
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
@@ -50,7 +50,7 @@ spec:
              value: nextcloud-aio-redis
            - name: REDIS_HOST_PASSWORD
              value: "{{ .Values.REDIS_PASSWORD }}"
-          image: nextcloud/aio-notify-push:20230720_134150-latest
+          image: nextcloud/aio-notify-push:20230728_085937-latest
          name: nextcloud-aio-notify-push
          ports:
            - containerPort: 7867
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
@@ -43,7 +43,7 @@ spec:
              value: "{{ .Values.ONLYOFFICE_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-onlyoffice:20230720_134150-latest
+          image: nextcloud/aio-onlyoffice:20230728_085937-latest
          name: nextcloud-aio-onlyoffice
          ports:
            - containerPort: 80
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
@@ -38,7 +38,7 @@ spec:
              value: "{{ .Values.REDIS_PASSWORD }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-redis:20230720_134150-latest
+          image: nextcloud/aio-redis:20230728_085937-latest
          name: nextcloud-aio-redis
          ports:
            - containerPort: 6379
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
@@ -59,7 +59,7 @@ spec:
              value: "{{ .Values.TURN_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-talk:20230720_134150-latest
+          image: nextcloud/aio-talk:20230728_085937-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
@@ -46,7 +46,7 @@ spec:
              value: "{{ .Values.RECORDING_SECRET }}"
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-talk-recording:20230720_134150-latest
+          image: nextcloud/aio-talk-recording:20230728_085937-latest
          name: nextcloud-aio-talk-recording
          ports:
            - containerPort: 1234
--- a/php/composer.lock
+++ b/php/composer.lock
@@ -461,16 +461,16 @@
        },
        {
            "name": "laravel/serializable-closure",
-            "version": "v1.3.0",
+            "version": "v1.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37"
+                "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37",
-                "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/e5a3057a5591e1cfe8183034b0203921abe2c902",
+                "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902",
                "shasum": ""
            },
            "require": {
@@ -517,7 +517,7 @@
                "issues": "https://github.com/laravel/serializable-closure/issues",
                "source": "https://github.com/laravel/serializable-closure"
            },
-            "time": "2023-01-30T18:31:20+00:00"
+            "time": "2023-07-14T13:56:28+00:00"
        },
        {
            "name": "nikic/fast-route",
@@ -1218,16 +1218,16 @@
        },
        {
            "name": "slim/slim",
-            "version": "4.11.0",
+            "version": "4.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/slimphp/Slim.git",
-                "reference": "b0f4ca393ea037be9ac7292ba7d0a34d18bac0c7"
+                "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/b0f4ca393ea037be9ac7292ba7d0a34d18bac0c7",
-                "reference": "b0f4ca393ea037be9ac7292ba7d0a34d18bac0c7",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
+                "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
                "shasum": ""
            },
            "require": {
@@ -1236,26 +1236,26 @@
                "php": "^7.4 || ^8.0",
                "psr/container": "^1.0 || ^2.0",
                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
+                "psr/http-message": "^1.1",
                "psr/http-server-handler": "^1.0",
                "psr/http-server-middleware": "^1.0",
                "psr/log": "^1.1 || ^2.0 || ^3.0"
            },
            "require-dev": {
-                "adriansuter/php-autoload-override": "^1.3",
+                "adriansuter/php-autoload-override": "^1.4",
                "ext-simplexml": "*",
-                "guzzlehttp/psr7": "^2.4",
-                "httpsoft/http-message": "^1.0",
-                "httpsoft/http-server-request": "^1.0",
+                "guzzlehttp/psr7": "^2.5",
+                "httpsoft/http-message": "^1.1",
+                "httpsoft/http-server-request": "^1.1",
                "laminas/laminas-diactoros": "^2.17",
-                "nyholm/psr7": "^1.5",
+                "nyholm/psr7": "^1.8",
                "nyholm/psr7-server": "^1.0",
-                "phpspec/prophecy": "^1.15",
+                "phpspec/prophecy": "^1.17",
                "phpspec/prophecy-phpunit": "^2.0",
-                "phpstan/phpstan": "^1.8",
-                "phpunit/phpunit": "^9.5",
-                "slim/http": "^1.2",
-                "slim/psr7": "^1.5",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.6",
+                "slim/http": "^1.3",
+                "slim/psr7": "^1.6",
                "squizlabs/php_codesniffer": "^3.7"
            },
            "suggest": {
@@ -1329,7 +1329,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-06T16:33:39+00:00"
+            "time": "2023-07-23T04:54:29+00:00"
        },
        {
            "name": "slim/twig-view",
@@ -1709,16 +1709,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.6.1",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd"
+                "reference": "5cf942bbab3df42afa918caeba947f1b690af64b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd",
-                "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/5cf942bbab3df42afa918caeba947f1b690af64b",
+                "reference": "5cf942bbab3df42afa918caeba947f1b690af64b",
                "shasum": ""
            },
            "require": {
@@ -1764,7 +1764,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.6.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.7.0"
            },
            "funding": [
                {
@@ -1776,7 +1776,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-06-08T12:52:13+00:00"
+            "time": "2023-07-26T07:16:09+00:00"
        }
    ],
    "packages-dev": [],
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -211,9 +211,16 @@ class DockerActionManager

    public function CreateContainer(Container $container) : void {
        $volumes = [];
-        foreach($container->GetVolumes()->GetVolumes() as $volume) {
+        foreach ($container->GetVolumes()->GetVolumes() as $volume) {
+            // NEXTCLOUD_MOUNT gets added via bind-mount later on
+            if ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') {
+                if ($volume->name === $this->configurationManager->GetNextcloudMount()) {
+                    continue;
+                }
+            }
+
            $volumeEntry = $volume->name . ':' . $volume->mountPoint;
-            if($volume->isWritable) {
+            if ($volume->isWritable) {
                $volumeEntry = $volumeEntry . ':' . 'rw';
            } else {
                $volumeEntry = $volumeEntry . ':' . 'ro';
@@ -226,7 +233,7 @@ class DockerActionManager
            'Image' => $this->BuildImageName($container),
        ];

-        if(count($volumes) > 0) {
+        if (count($volumes) > 0) {
            $requestBody['HostConfig']['Binds'] = $volumes;
        }

@@ -447,10 +454,11 @@ class DockerActionManager
            $requestBody['HostConfig']['SecurityOpt'] = ["apparmor:unconfined"];
        }

+        $mounts = [];
+
        // Special things for the backup container which should not be exposed in the containers.json
        if ($container->GetIdentifier() === 'nextcloud-aio-borgbackup') {
            // Additional backup directories
-            $mounts = [];
            foreach ($this->getAllBackupVolumes() as $additionalBackupVolumes) {
                if ($additionalBackupVolumes !== '') {
                    $mounts[] = ["Type" => "volume", "Source" => $additionalBackupVolumes, "Target" => "/nextcloud_aio_volumes/" . $additionalBackupVolumes, "ReadOnly" => false];
@@ -465,13 +473,22 @@ class DockerActionManager
                    }
                }
            }
-            if(count($mounts) > 0) {
-                $requestBody['HostConfig']['Mounts'] = $mounts;
-            }
        // Special things for the talk container which should not be exposed in the containers.json
        } elseif ($container->GetIdentifier() === 'nextcloud-aio-talk') {
            // This is needed due to a bug in libwebsockets which cannot handle unlimited ulimits
            $requestBody['HostConfig']['Ulimits'] = [["Name" => "nofile", "Hard" => 200000, "Soft" => 200000]];
+        // Special things for the nextcloud container which should not be exposed in the containers.json
+        } elseif ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') {
+            foreach ($container->GetVolumes()->GetVolumes() as $volume) {
+                if ($volume->name !== $this->configurationManager->GetNextcloudMount()) {
+                    continue;
+                }
+                $mounts[] = ["Type" => "bind", "Source" => $volume->name, "Target" => $volume->mountPoint, "ReadOnly" => !$volume->isWritable, "BindOptions" => [ "Propagation" => "rshared"]];
+            }
+        }
+
+        if (count($mounts) > 0) {
+            $requestBody['HostConfig']['Mounts'] = $mounts;
        }

        $url = $this->BuildApiUrl('containers/create?name=' . $container->GetIdentifier());
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -16,7 +16,7 @@
    </header>

    <div class="content">
-        <h1>Nextcloud AIO v6.3.0</h1>
+        <h1>Nextcloud AIO v6.4.0</h1>

        {# Add 2nd tab warning #}
        <script type="text/javascript" src="second-tab-warning.js"></script>
Author	SHA1	Message	Date
Simon L	4253ccd43b	Merge pull request #3043 from nextcloud/aio-helm-update Helm Chart updates	2023-07-28 11:41:17 +02:00
Simon L	400ba74f97	Merge pull request #3000 from nextcloud/enh/noid/allow-configure-hpb-domain talk-recording - allow to set hpb_domain and nc_domain independently	2023-07-28 11:39:13 +02:00
Simon L	0c4885323d	Merge pull request #3036 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.2.2.1 Bump collabora/code from 23.05.1.3.1 to 23.05.2.2.1 in /Containers/collabora	2023-07-28 11:37:59 +02:00
Simon L	48a9699f42	Merge pull request #3032 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-24.0.5-cli Bump docker from 24.0.4-cli to 24.0.5-cli in /Containers/mastercontainer	2023-07-28 11:36:50 +02:00
Simon L	828190e242	Merge pull request #3021 from nextcloud/enh/noid/persistant-db-connections make database connections persistant	2023-07-28 11:36:02 +02:00
Simon L	4ac2dbd7d1	Merge pull request #3019 from nextcloud/aio-dependency-update PHP dependency updates	2023-07-28 11:34:17 +02:00
dependabot[bot]	23e0a402d0	Bump docker from 24.0.4-cli to 24.0.5-cli in /Containers/mastercontainer Bumps docker from 24.0.4-cli to 24.0.5-cli. --- updated-dependencies: - dependency-name: docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-28 09:29:19 +00:00
Simon L	97a0542ef6	Merge pull request #3005 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.8.1 Bump elasticsearch from 8.8.0 to 8.8.1 in /Containers/fulltextsearch	2023-07-28 11:28:30 +02:00
szaimen	c2505e8976	Helm Chart updates Signed-off-by: GitHub <noreply@github.com>	2023-07-28 09:08:22 +00:00
dependabot[bot]	4bb57f8055	Bump elasticsearch from 8.8.0 to 8.8.1 in /Containers/fulltextsearch Bumps elasticsearch from 8.8.0 to 8.8.1. --- updated-dependencies: - dependency-name: elasticsearch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-28 09:03:06 +00:00
Simon L	6d2272cf11	Merge pull request #3002 from nextcloud/aio-yaml-update Yaml updates	2023-07-28 11:02:18 +02:00
Simon L	42b065b0c1	Revert "make database connections persistant" This reverts commit `dace781b4e`. Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-27 14:39:04 +02:00
dependabot[bot]	3a6cf31c4d	Bump collabora/code in /Containers/collabora Bumps collabora/code from 23.05.1.3.1 to 23.05.2.2.1. --- updated-dependencies: - dependency-name: collabora/code dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-26 13:00:48 +00:00
szaimen	7125b541ba	php dependency updates Signed-off-by: GitHub <noreply@github.com>	2023-07-26 12:02:32 +00:00
szaimen	7de9aae2b8	Yaml updates Signed-off-by: GitHub <noreply@github.com>	2023-07-24 12:03:37 +00:00
Simon L	dace781b4e	make database connections persistant Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-24 01:17:40 +02:00
Simon L	b076d5ea1a	adjust commit message for dependency updates to php Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-23 16:45:58 +02:00
Simon L	dc017401bb	Merge pull request #3017 from sheikhmishar/patch-1 Update manual-upgrade.md shebang	2023-07-23 16:17:02 +02:00
Syed Mishar Newaz	5c01be9852	Update manual-upgrade.md shebang There was an exclamation (!) missing from shebang. As a result, execution of this script could result in unexpected behaviour Signed-off-by: Syed Mishar Newaz <misharex.sezan@gmail.com>	2023-07-23 19:23:57 +06:00
Simon L	ff836c4689	talk-recording - allow to set hpb_domain and nc_domain independently Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-21 11:32:44 +02:00
Simon L	f86032a7e4	increase to 6.4.0 Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-21 00:45:43 +02:00
Simon L	2f842e7266	also add it to libusrtctp to normal container Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-20 18:11:31 +02:00
Simon L	2c26a1957c	fix compiling janus with datachannel support Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-20 17:52:30 +02:00
Simon L	5b7c9a096f	fix bind propagation Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-20 16:44:24 +02:00
Simon L	86f606b407	remove cr release notes again since they dont work correctly Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-20 16:10:59 +02:00
Simon L	dc36781035	Merge pull request #2958 from nextcloud/dependabot/docker/Containers/talk/nats-2.9.20-scratch Bump nats from 2.9.19-scratch to 2.9.20-scratch in /Containers/talk	2023-07-20 16:10:03 +02:00
Simon L	00557fecd2	Merge pull request #2601 from nextcloud/enh/2585/volume-mounts set NEXTCLOUD_MOUNT to rshared	2023-07-20 16:07:48 +02:00
dependabot[bot]	de14dd2052	Bump nats from 2.9.19-scratch to 2.9.20-scratch in /Containers/talk Bumps nats from 2.9.19-scratch to 2.9.20-scratch. --- updated-dependencies: - dependency-name: nats dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-20 14:05:21 +00:00
Simon L	7824060a6c	set NEXTCLOUD_MOUNT to rshared Signed-off-by: Simon L <szaimen@e.mail.de>	2023-07-19 15:40:31 +02:00