From f98528eac5e8fdeb1656d387c7b80d387aa7a515 Mon Sep 17 00:00:00 2001 From: Simon L Date: Fri, 30 Dec 2022 23:49:54 +0100 Subject: [PATCH] rename services to aio_services_v1 Signed-off-by: Simon L --- manual-install/update-yaml.sh | 1 + php/containers-schema.json | 4 ++-- php/containers.json | 2 +- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 445b86bf..27a6529b 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -1,6 +1,7 @@ #!/bin/bash jq -c . ./php/containers.json > /tmp/containers.json +sed -i 's|aio_services_v1|services|g' /tmp/containers.json sed -i 's|","destination":"|:|g' /tmp/containers.json sed -i 's|","writeable":false|:ro"|g' /tmp/containers.json sed -i 's|","writeable":true|:rw"|g' /tmp/containers.json diff --git a/php/containers-schema.json b/php/containers-schema.json index 887af502..c2e962dc 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -2,9 +2,9 @@ "type": "object", "description": "AIO containers definition schema", "minProperties": 1, - "required": ["services"], + "required": ["aio_services_v1"], "properties": { - "services": { + "aio_services_v1": { "type": "array", "items": { "type": "object", diff --git a/php/containers.json b/php/containers.json index 915bc324..9cb179dc 100644 --- a/php/containers.json +++ b/php/containers.json @@ -1,5 +1,5 @@ { - "services": [ + "aio_services_v1": [ { "container_name": "nextcloud-aio-apache", "depends_on": [ diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 1766fc6c..a31d7d36 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -48,7 +48,7 @@ class ContainerDefinitionFetcher $data = json_decode(file_get_contents(__DIR__ . '/../containers.json'), true); $containers = []; - foreach ($data['services'] as $entry) { + foreach ($data['aio_services_v1'] as $entry) { if ($entry['container_name'] === 'nextcloud-aio-clamav') { if (!$this->configurationManager->isClamavEnabled()) { continue;