eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

rename dependsOn to depends_on

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2022-12-25 00:39:22 +01:00
parent 7720ed5061
commit 6cca3ceb6c
4 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
manual-install/update-yaml.sh
View file

@ -25,7 +25,6 @@ sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml
sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml
sed -i 's|containerName:|image:|' containers.yml sed -i 's|containerName:|image:|' containers.yml
sed -i '/: \[\]/d' containers.yml sed -i '/: \[\]/d' containers.yml
sed -i 's|dependsOn:|depends_on:|' containers.yml
sed -i 's|- name: |- |' containers.yml sed -i 's|- name: |- |' containers.yml
TCP="$(grep -oP '[%A-Z0-9_]+/tcp' containers.yml | sort -u)" TCP="$(grep -oP '[%A-Z0-9_]+/tcp' containers.yml | sort -u)"

2
php/containers-schema.json
View file

@ -14,7 +14,7 @@
"containerName": { "containerName": {
"type": "string" "type": "string"
}, },
"dependsOn": { "depends_on": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"

26
php/containers.json
View file

@ -2,7 +2,7 @@
"production": [ "production": [
{ {
"container_name": "nextcloud-aio-apache", "container_name": "nextcloud-aio-apache",
"dependsOn": [ "depends_on": [
"nextcloud-aio-onlyoffice", "nextcloud-aio-onlyoffice",
"nextcloud-aio-collabora", "nextcloud-aio-collabora",
"nextcloud-aio-talk", "nextcloud-aio-talk",
@ -45,7 +45,7 @@
}, },
{ {
"container_name": "nextcloud-aio-database", "container_name": "nextcloud-aio-database",
"dependsOn": [], "depends_on": [],
"displayName": "Database", "displayName": "Database",
"containerName": "nextcloud/aio-postgresql", "containerName": "nextcloud/aio-postgresql",
"ports": [], "ports": [],
@ -79,7 +79,7 @@
}, },
{ {
"container_name": "nextcloud-aio-nextcloud", "container_name": "nextcloud-aio-nextcloud",
"dependsOn": [ "depends_on": [
"nextcloud-aio-database", "nextcloud-aio-database",
"nextcloud-aio-redis", "nextcloud-aio-redis",
"nextcloud-aio-clamav", "nextcloud-aio-clamav",
@ -167,7 +167,7 @@
}, },
{ {
"container_name": "nextcloud-aio-redis", "container_name": "nextcloud-aio-redis",
"dependsOn": [], "depends_on": [],
"displayName": "Redis", "displayName": "Redis",
"containerName": "nextcloud/aio-redis", "containerName": "nextcloud/aio-redis",
"ports": [], "ports": [],
@ -194,7 +194,7 @@
}, },
{ {
"container_name": "nextcloud-aio-collabora", "container_name": "nextcloud-aio-collabora",
"dependsOn": [], "depends_on": [],
"displayName": "Collabora", "displayName": "Collabora",
"containerName": "nextcloud/aio-collabora", "containerName": "nextcloud/aio-collabora",
"ports": [], "ports": [],
@ -220,7 +220,7 @@
}, },
{ {
"container_name": "nextcloud-aio-talk", "container_name": "nextcloud-aio-talk",
"dependsOn": [], "depends_on": [],
"displayName": "Talk", "displayName": "Talk",
"containerName": "nextcloud/aio-talk", "containerName": "nextcloud/aio-talk",
"ports": [ "ports": [
@ -249,7 +249,7 @@
}, },
{ {
"container_name": "nextcloud-aio-borgbackup", "container_name": "nextcloud-aio-borgbackup",
"dependsOn": [], "depends_on": [],
"displayName": "Borgbackup", "displayName": "Borgbackup",
"containerName": "nextcloud/aio-borgbackup", "containerName": "nextcloud/aio-borgbackup",
"ports": [], "ports": [],
@ -322,7 +322,7 @@
}, },
{ {
"container_name": "nextcloud-aio-watchtower", "container_name": "nextcloud-aio-watchtower",
"dependsOn": [], "depends_on": [],
"displayName": "Watchtower", "displayName": "Watchtower",
"containerName": "nextcloud/aio-watchtower", "containerName": "nextcloud/aio-watchtower",
"ports": [], "ports": [],
@ -342,7 +342,7 @@
"restartPolicy": "" "restartPolicy": ""
}, },
{ {
"dependsOn": [], "depends_on": [],
"container_name": "nextcloud-aio-domaincheck", "container_name": "nextcloud-aio-domaincheck",
"displayName": "Domaincheck", "displayName": "Domaincheck",
"containerName": "nextcloud/aio-domaincheck", "containerName": "nextcloud/aio-domaincheck",
@ -363,7 +363,7 @@
}, },
{ {
"container_name": "nextcloud-aio-clamav", "container_name": "nextcloud-aio-clamav",
"dependsOn": [], "depends_on": [],
"displayName": "ClamAV", "displayName": "ClamAV",
"containerName": "nextcloud/aio-clamav", "containerName": "nextcloud/aio-clamav",
"ports": [], "ports": [],
@ -387,7 +387,7 @@
}, },
{ {
"container_name": "nextcloud-aio-onlyoffice", "container_name": "nextcloud-aio-onlyoffice",
"dependsOn": [], "depends_on": [],
"displayName": "OnlyOffice", "displayName": "OnlyOffice",
"containerName": "nextcloud/aio-onlyoffice", "containerName": "nextcloud/aio-onlyoffice",
"ports": [], "ports": [],
@ -415,7 +415,7 @@
}, },
{ {
"container_name": "nextcloud-aio-imaginary", "container_name": "nextcloud-aio-imaginary",
"dependsOn": [], "depends_on": [],
"displayName": "Imaginary", "displayName": "Imaginary",
"containerName": "nextcloud/aio-imaginary", "containerName": "nextcloud/aio-imaginary",
"ports": [], "ports": [],
@ -432,7 +432,7 @@
}, },
{ {
"container_name": "nextcloud-aio-fulltextsearch", "container_name": "nextcloud-aio-fulltextsearch",
"dependsOn": [], "depends_on": [],
"displayName": "Fulltextsearch", "displayName": "Fulltextsearch",
"containerName": "nextcloud/aio-fulltextsearch", "containerName": "nextcloud/aio-fulltextsearch",
"ports": [], "ports": [],

2
php/src/ContainerDefinitionFetcher.php
View file

@ -142,7 +142,7 @@ class ContainerDefinitionFetcher
} }
$dependsOn = []; $dependsOn = [];
foreach ($entry['dependsOn'] as $value) { foreach ($entry['depends_on'] as $value) {
if ($value === 'nextcloud-aio-clamav') { if ($value === 'nextcloud-aio-clamav') {
if (!$this->configurationManager->isClamavEnabled()) { if (!$this->configurationManager->isClamavEnabled()) {
continue; continue;