Merge pull request #5530 from nextcloud/enh/noid/user-string

user must be a string
nextcloud · Nov 6, 2024 · 5c4d0b7 · 5c4d0b7
2 parents 8d81f56 + 4c83aac
commit 5c4d0b7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 22 deletions.
diff --git a/.github/workflows/json-validator.yml b/.github/workflows/json-validator.yml
@@ -21,7 +21,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install python3-pip -y --no-install-recommends
-          sudo pip3 install json-spec --break-system-packages
+          pip3 install json-spec
+          export PATH="$PATH:/home/runner/.local/bin"
           if ! json validate --schema-file=php/containers-schema.json --document-file=php/containers.json; then
             exit 1
           fi

diff --git a/manual-install/latest.yml b/manual-install/latest.yml
@@ -20,7 +20,7 @@ services:
         condition: service_started
         required: false
     image: nextcloud/aio-apache:latest
-    user: 33
+    user: "33"
     init: true
     ports:
       - ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp
@@ -54,7 +54,7 @@ services:
 
   nextcloud-aio-database:
     image: nextcloud/aio-postgresql:latest
-    user: 999
+    user: "999"
     init: true
     expose:
       - "5432"
@@ -163,7 +163,7 @@ services:
 
   nextcloud-aio-notify-push:
     image: nextcloud/aio-notify-push:latest
-    user: 33
+    user: "33"
     init: true
     expose:
       - "7867"
@@ -186,7 +186,7 @@ services:
 
   nextcloud-aio-redis:
     image: nextcloud/aio-redis:latest
-    user: 999
+    user: "999"
     init: true
     expose:
       - "6379"
@@ -202,7 +202,7 @@ services:
 
   nextcloud-aio-collabora:
     image: nextcloud/aio-collabora:latest
-    user: 100
+    user: "100"
     init: true
     expose:
       - "9980"
@@ -224,7 +224,7 @@ services:
 
   nextcloud-aio-talk:
     image: nextcloud/aio-talk:latest
-    user: 1000
+    user: "1000"
     init: true
     ports:
       - ${TALK_PORT}:${TALK_PORT}/tcp
@@ -255,7 +255,7 @@ services:
 
   nextcloud-aio-talk-recording:
     image: nextcloud/aio-talk-recording:latest
-    user: 122
+    user: "122"
     init: true
     expose:
       - "1234"
@@ -277,7 +277,7 @@ services:
 
   nextcloud-aio-clamav:
     image: nextcloud/aio-clamav:latest
-    user: 100
+    user: "100"
     init: false
     expose:
       - "3310"
@@ -318,7 +318,7 @@ services:
 
   nextcloud-aio-imaginary:
     image: nextcloud/aio-imaginary:latest
-    user: 65534
+    user: "65534"
     init: true
     expose:
       - "9000"
@@ -362,7 +362,7 @@ services:
 
   nextcloud-aio-whiteboard:
     image: nextcloud/aio-whiteboard:latest
-    user: 65534
+    user: "65534"
     init: true
     expose:
       - "3002"

diff --git a/php/containers-schema.json b/php/containers-schema.json
@@ -69,7 +69,8 @@
 						"type": "integer"
 					},
 					"user": {
-						"type": "integer"
+						"type": "string",
+						"pattern": "^[0-9]{1,6}$"
 					},
 					"ports": {
 						"type": "array",

diff --git a/php/containers.json b/php/containers.json
@@ -13,7 +13,7 @@
       ],
       "display_name": "Apache",
       "image": "nextcloud/aio-apache",
-      "user": 33,
+      "user": "33",
       "init": true,
       "ports": [
         {
@@ -79,7 +79,7 @@
       "image_tag": "%AIO_CHANNEL%",
       "display_name": "Database",
       "image": "nextcloud/aio-postgresql",
-      "user": 999,
+      "user": "999",
       "init": true,
       "expose": [
         "5432"
@@ -253,7 +253,7 @@
       "image_tag": "%AIO_CHANNEL%",
       "display_name": "Notify Push",
       "image": "nextcloud/aio-notify-push",
-      "user": 33,
+      "user": "33",
       "init": true,
       "expose": [
         "7867"
@@ -295,7 +295,7 @@
       "image_tag": "%AIO_CHANNEL%",
       "display_name": "Redis",
       "image": "nextcloud/aio-redis",
-      "user": 999,
+      "user": "999",
       "init": true,
       "expose": [
         "6379"
@@ -332,7 +332,7 @@
       "documentation": "https://github.com/nextcloud/all-in-one/discussions/1358",
       "display_name": "Collabora",
       "image": "nextcloud/aio-collabora",
-      "user": 100,
+      "user": "100",
       "init": true,
       "expose": [
         "9980"
@@ -371,7 +371,7 @@
       "documentation": "https://github.com/nextcloud/all-in-one/discussions/1358",
       "display_name": "Talk",
       "image": "nextcloud/aio-talk",
-      "user": 1000,
+      "user": "1000",
       "init": true,
       "ports": [
         {
@@ -428,7 +428,7 @@
       "image_tag": "%AIO_CHANNEL%",
       "display_name": "Talk Recording",
       "image": "nextcloud/aio-talk-recording",
-      "user": 122,
+      "user": "122",
       "init": true,
       "expose": [
         "1234"
@@ -582,7 +582,7 @@
       "image_tag": "%AIO_CHANNEL%",
       "display_name": "ClamAV",
       "image": "nextcloud/aio-clamav",
-      "user": 100,
+      "user": "100",
       "init": false,
       "expose": [
         "3310"
@@ -663,7 +663,7 @@
       "image_tag": "%AIO_CHANNEL%",
       "display_name": "Imaginary",
       "image": "nextcloud/aio-imaginary",
-      "user": 65534,
+      "user": "65534",
       "init": true,
       "expose": [
         "9000"
@@ -769,7 +769,7 @@
       "image_tag": "%AIO_CHANNEL%",
       "display_name": "Whiteboard",
       "image": "nextcloud/aio-whiteboard",
-      "user": 65534,
+      "user": "65534",
       "init": true,
       "expose": [
         "3002"