From 9e09c38bbd57feb07c91753acc8ca0a2e47027a0 Mon Sep 17 00:00:00 2001
From: "Simon L." <szaimen@e.mail.de>
Date: Thu, 21 Nov 2024 18:58:24 +0100
Subject: [PATCH] df

---
 manual-install/latest.yml                                      | 1 -
 .../templates/nextcloud-aio-collabora-deployment.yaml          | 1 -
 .../templates/nextcloud-aio-fulltextsearch-deployment.yaml     | 3 ---
 nextcloud-aio-helm-chart/update-helm.sh                        | 2 +-
 php/containers.json                                            | 1 -
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/manual-install/latest.yml b/manual-install/latest.yml
index 90c197b8c9f..571c9a7e5d4 100644
--- a/manual-install/latest.yml
+++ b/manual-install/latest.yml
@@ -202,7 +202,6 @@ services:
 
   nextcloud-aio-collabora:
     image: nextcloud/aio-collabora:latest
-    user: "100"
     init: true
     expose:
       - "9980"
diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
index e43aa08ad9b..a44d7eb092a 100755
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
@@ -50,5 +50,4 @@ spec:
                 - SYS_ADMIN
               drop:
                 - NET_RAW
-            runAsUser: 100
 {{- end }}
diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
index 5af1b32ea3b..d87d1c89bf3 100755
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
@@ -24,9 +24,6 @@ spec:
       labels:
         io.kompose.service: nextcloud-aio-fulltextsearch
     spec:
-      securityContext:
-        runAsUser: 1000
-        runAsGroup: 0
       initContainers:
         - name: init-volumes
           image: "alpine:3.20"
diff --git a/nextcloud-aio-helm-chart/update-helm.sh b/nextcloud-aio-helm-chart/update-helm.sh
index b4d43b45d84..dd91459cbe6 100755
--- a/nextcloud-aio-helm-chart/update-helm.sh
+++ b/nextcloud-aio-helm-chart/update-helm.sh
@@ -120,7 +120,7 @@ for variable in "${DEPLOYMENTS[@]}"; do
             sed -i "/^    spec:/r /tmp/initcontainers.clamav" "$variable"
         elif echo "$variable" | grep -q "nextcloud-deployment.yaml"; then
             sed -i "/^    spec:/r /tmp/initcontainers.nextcloud" "$variable"
-        else
+        elif echo "$variable" | grep -q "fulltextsearch" || echo "$variable" | grep -q "onlyoffice" || echo "$variable" | grep -q "collabora"; then
             sed -i "/^    spec:/r /tmp/initcontainers" "$variable"
         fi
         volumeNames="$(grep -A1 mountPath "$variable" | grep -v mountPath | sed 's|.*name: ||' | sed '/^--$/d')"
diff --git a/php/containers.json b/php/containers.json
index bf5ae3e931a..17f60b2d7fd 100644
--- a/php/containers.json
+++ b/php/containers.json
@@ -332,7 +332,6 @@
       "documentation": "https://github.com/nextcloud/all-in-one/discussions/1358",
       "display_name": "Collabora",
       "image": "nextcloud/aio-collabora",
-      "user": "100",
       "init": true,
       "expose": [
         "9980"