From b498f557cf2911880608f60cd8aa7e0c489c3914 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Wed, 6 Nov 2024 16:17:22 +0100 Subject: [PATCH 1/3] user must be a string Signed-off-by: Simon L. --- php/containers-schema.json | 3 ++- php/containers.json | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/php/containers-schema.json b/php/containers-schema.json index b1e0cfbf5c3..cf3f893fb44 100644 --- 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 index 4bd37281cbd..11eae04b744 100644 --- 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" From ad32d0af9c1dbebb1201eeaeb1d4a82538384da1 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Wed, 6 Nov 2024 16:21:04 +0100 Subject: [PATCH 2/3] try to fix workflows Signed-off-by: Simon L. --- .github/workflows/json-validator.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/json-validator.yml b/.github/workflows/json-validator.yml index 35f4e8e667c..91d5f169407 100644 --- 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 From 4c83aac666683fba4ee11d4b7ffabe3ca00cd070 Mon Sep 17 00:00:00 2001 From: szaimen <42591237+szaimen@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:18:27 +0000 Subject: [PATCH 3/3] Yaml updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: Simon L. --- manual-install/latest.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manual-install/latest.yml b/manual-install/latest.yml index a88066a4ff3..90c197b8c9f 100644 --- 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"