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

rename identifier to container_name

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

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

@ -7,9 +7,9 @@ sed -i 's|","writeable":true|:rw"|g' /tmp/containers.json
OUTPUT="$(cat /tmp/containers.json)" OUTPUT="$(cat /tmp/containers.json)"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].internalPorts)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].internalPorts)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].secrets)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].secrets)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.identifier == "nextcloud-aio-watchtower"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.container_name == "nextcloud-aio-watchtower"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.identifier == "nextcloud-aio-domaincheck"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.container_name == "nextcloud-aio-domaincheck"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.identifier == "nextcloud-aio-borgbackup"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.container_name == "nextcloud-aio-borgbackup"))')"
snap install yq snap install yq
mkdir -p ./manual-install mkdir -p ./manual-install
@ -18,7 +18,6 @@ echo "$OUTPUT" | yq -P > ./manual-install/containers.yml
cd manual-install || exit cd manual-install || exit
sed -i "s|'||g" containers.yml sed -i "s|'||g" containers.yml
sed -i 's|production:|services:|' containers.yml sed -i 's|production:|services:|' containers.yml
sed -i 's|- identifier:| container_name:|' containers.yml
sed -i 's|restartPolicy:|restart:|' containers.yml sed -i 's|restartPolicy:|restart:|' containers.yml
sed -i 's|environmentVariables:|environment:|' containers.yml sed -i 's|environmentVariables:|environment:|' containers.yml
sed -i '/displayName:/d' containers.yml sed -i '/displayName:/d' containers.yml

2
php/containers-schema.json
View file

@ -29,7 +29,7 @@
"type": "string" "type": "string"
} }
}, },
"identifier": { "container_name": {
"type": "string" "type": "string"
}, },
"internalPorts": { "internalPorts": {

26
php/containers.json
View file

@ -1,7 +1,7 @@
{ {
"production": [ "production": [
{ {
"identifier": "nextcloud-aio-apache", "container_name": "nextcloud-aio-apache",
"dependsOn": [ "dependsOn": [
"nextcloud-aio-onlyoffice", "nextcloud-aio-onlyoffice",
"nextcloud-aio-collabora", "nextcloud-aio-collabora",
@ -44,7 +44,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-database", "container_name": "nextcloud-aio-database",
"dependsOn": [], "dependsOn": [],
"displayName": "Database", "displayName": "Database",
"containerName": "nextcloud/aio-postgresql", "containerName": "nextcloud/aio-postgresql",
@ -78,7 +78,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-nextcloud", "container_name": "nextcloud-aio-nextcloud",
"dependsOn": [ "dependsOn": [
"nextcloud-aio-database", "nextcloud-aio-database",
"nextcloud-aio-redis", "nextcloud-aio-redis",
@ -166,7 +166,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-redis", "container_name": "nextcloud-aio-redis",
"dependsOn": [], "dependsOn": [],
"displayName": "Redis", "displayName": "Redis",
"containerName": "nextcloud/aio-redis", "containerName": "nextcloud/aio-redis",
@ -193,7 +193,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-collabora", "container_name": "nextcloud-aio-collabora",
"dependsOn": [], "dependsOn": [],
"displayName": "Collabora", "displayName": "Collabora",
"containerName": "nextcloud/aio-collabora", "containerName": "nextcloud/aio-collabora",
@ -219,7 +219,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-talk", "container_name": "nextcloud-aio-talk",
"dependsOn": [], "dependsOn": [],
"displayName": "Talk", "displayName": "Talk",
"containerName": "nextcloud/aio-talk", "containerName": "nextcloud/aio-talk",
@ -248,7 +248,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-borgbackup", "container_name": "nextcloud-aio-borgbackup",
"dependsOn": [], "dependsOn": [],
"displayName": "Borgbackup", "displayName": "Borgbackup",
"containerName": "nextcloud/aio-borgbackup", "containerName": "nextcloud/aio-borgbackup",
@ -321,7 +321,7 @@
"restartPolicy": "" "restartPolicy": ""
}, },
{ {
"identifier": "nextcloud-aio-watchtower", "container_name": "nextcloud-aio-watchtower",
"dependsOn": [], "dependsOn": [],
"displayName": "Watchtower", "displayName": "Watchtower",
"containerName": "nextcloud/aio-watchtower", "containerName": "nextcloud/aio-watchtower",
@ -343,7 +343,7 @@
}, },
{ {
"dependsOn": [], "dependsOn": [],
"identifier": "nextcloud-aio-domaincheck", "container_name": "nextcloud-aio-domaincheck",
"displayName": "Domaincheck", "displayName": "Domaincheck",
"containerName": "nextcloud/aio-domaincheck", "containerName": "nextcloud/aio-domaincheck",
"ports": [ "ports": [
@ -362,7 +362,7 @@
"restartPolicy": "" "restartPolicy": ""
}, },
{ {
"identifier": "nextcloud-aio-clamav", "container_name": "nextcloud-aio-clamav",
"dependsOn": [], "dependsOn": [],
"displayName": "ClamAV", "displayName": "ClamAV",
"containerName": "nextcloud/aio-clamav", "containerName": "nextcloud/aio-clamav",
@ -386,7 +386,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-onlyoffice", "container_name": "nextcloud-aio-onlyoffice",
"dependsOn": [], "dependsOn": [],
"displayName": "OnlyOffice", "displayName": "OnlyOffice",
"containerName": "nextcloud/aio-onlyoffice", "containerName": "nextcloud/aio-onlyoffice",
@ -414,7 +414,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-imaginary", "container_name": "nextcloud-aio-imaginary",
"dependsOn": [], "dependsOn": [],
"displayName": "Imaginary", "displayName": "Imaginary",
"containerName": "nextcloud/aio-imaginary", "containerName": "nextcloud/aio-imaginary",
@ -431,7 +431,7 @@
"restartPolicy": "unless-stopped" "restartPolicy": "unless-stopped"
}, },
{ {
"identifier": "nextcloud-aio-fulltextsearch", "container_name": "nextcloud-aio-fulltextsearch",
"dependsOn": [], "dependsOn": [],
"displayName": "Fulltextsearch", "displayName": "Fulltextsearch",
"containerName": "nextcloud/aio-fulltextsearch", "containerName": "nextcloud/aio-fulltextsearch",

14
php/src/ContainerDefinitionFetcher.php
View file

@ -49,27 +49,27 @@ class ContainerDefinitionFetcher
$containers = []; $containers = [];
foreach ($data['production'] as $entry) { foreach ($data['production'] as $entry) {
if ($entry['identifier'] === 'nextcloud-aio-clamav') { if ($entry['container_name'] === 'nextcloud-aio-clamav') {
if (!$this->configurationManager->isClamavEnabled()) { if (!$this->configurationManager->isClamavEnabled()) {
continue; continue;
} }
} elseif ($entry['identifier'] === 'nextcloud-aio-onlyoffice') { } elseif ($entry['container_name'] === 'nextcloud-aio-onlyoffice') {
if (!$this->configurationManager->isOnlyofficeEnabled()) { if (!$this->configurationManager->isOnlyofficeEnabled()) {
continue; continue;
} }
} elseif ($entry['identifier'] === 'nextcloud-aio-collabora') { } elseif ($entry['container_name'] === 'nextcloud-aio-collabora') {
if (!$this->configurationManager->isCollaboraEnabled()) { if (!$this->configurationManager->isCollaboraEnabled()) {
continue; continue;
} }
} elseif ($entry['identifier'] === 'nextcloud-aio-talk') { } elseif ($entry['container_name'] === 'nextcloud-aio-talk') {
if (!$this->configurationManager->isTalkEnabled()) { if (!$this->configurationManager->isTalkEnabled()) {
continue; continue;
} }
} elseif ($entry['identifier'] === 'nextcloud-aio-imaginary') { } elseif ($entry['container_name'] === 'nextcloud-aio-imaginary') {
if (!$this->configurationManager->isImaginaryEnabled()) { if (!$this->configurationManager->isImaginaryEnabled()) {
continue; continue;
} }
} elseif ($entry['identifier'] === 'nextcloud-aio-fulltextsearch') { } elseif ($entry['container_name'] === 'nextcloud-aio-fulltextsearch') {
if (!$this->configurationManager->isFulltextsearchEnabled()) { if (!$this->configurationManager->isFulltextsearchEnabled()) {
continue; continue;
} }
@ -177,7 +177,7 @@ class ContainerDefinitionFetcher
} }
$containers[] = new Container( $containers[] = new Container(
$entry['identifier'], $entry['container_name'],
$entry['displayName'], $entry['displayName'],
$entry['containerName'], $entry['containerName'],
$entry['restartPolicy'], $entry['restartPolicy'],