nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-02-24 13:57:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

rename internalPorts to internal_ports

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2022-12-25 01:03:17 +01:00
parent 7a9a452f45
commit 53065b5631
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ sed -i 's|","location":"|:|g' /tmp/containers.json
sed -i 's|","writeable":false|:ro"|g' /tmp/containers.json sed -i 's|","writeable":false|:ro"|g' /tmp/containers.json
sed -i 's|","writeable":true|:rw"|g' /tmp/containers.json 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(.services[].internalPorts)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].internal_ports)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].secrets)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].secrets)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-watchtower"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-watchtower"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')"

2
php/containers-schema.json
View file

@ -32,7 +32,7 @@
"container_name": { "container_name": {
"type": "string" "type": "string"
}, },
"internalPorts": { "internal_ports": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"

26
php/containers.json
View file

@ -13,7 +13,7 @@
"ports": [ "ports": [
"%APACHE_PORT%/tcp" "%APACHE_PORT%/tcp"
], ],
"internalPorts": [ "internal_ports": [
"%APACHE_PORT%" "%APACHE_PORT%"
], ],
"secrets": [], "secrets": [],
@ -49,7 +49,7 @@
"display_name": "Database", "display_name": "Database",
"image": "nextcloud/aio-postgresql", "image": "nextcloud/aio-postgresql",
"ports": [], "ports": [],
"internalPorts": [ "internal_ports": [
"5432" "5432"
], ],
"secrets": [ "secrets": [
@ -89,7 +89,7 @@
"display_name": "Nextcloud", "display_name": "Nextcloud",
"image": "nextcloud/aio-nextcloud", "image": "nextcloud/aio-nextcloud",
"ports": [], "ports": [],
"internalPorts": [ "internal_ports": [
"9000" "9000"
], ],
"secrets": [ "secrets": [
@ -171,7 +171,7 @@
"display_name": "Redis", "display_name": "Redis",
"image": "nextcloud/aio-redis", "image": "nextcloud/aio-redis",
"ports": [], "ports": [],
"internalPorts": [ "internal_ports": [
"6379" "6379"
], ],
"environment": [ "environment": [
@ -198,7 +198,7 @@
"display_name": "Collabora", "display_name": "Collabora",
"image": "nextcloud/aio-collabora", "image": "nextcloud/aio-collabora",
"ports": [], "ports": [],
"internalPorts": [ "internal_ports": [
"9980" "9980"
], ],
"environment": [ "environment": [
@ -227,7 +227,7 @@
"%TALK_PORT%/tcp", "%TALK_PORT%/tcp",
"%TALK_PORT%/udp" "%TALK_PORT%/udp"
], ],
"internalPorts": [ "internal_ports": [
"%TALK_PORT%" "%TALK_PORT%"
], ],
"environment": [ "environment": [
@ -253,7 +253,7 @@
"display_name": "Borgbackup", "display_name": "Borgbackup",
"image": "nextcloud/aio-borgbackup", "image": "nextcloud/aio-borgbackup",
"ports": [], "ports": [],
"internalPorts": [], "internal_ports": [],
"environment": [ "environment": [
"BORG_PASSWORD=%BORGBACKUP_PASSWORD%", "BORG_PASSWORD=%BORGBACKUP_PASSWORD%",
"BORG_MODE=%BORGBACKUP_MODE%", "BORG_MODE=%BORGBACKUP_MODE%",
@ -326,7 +326,7 @@
"display_name": "Watchtower", "display_name": "Watchtower",
"image": "nextcloud/aio-watchtower", "image": "nextcloud/aio-watchtower",
"ports": [], "ports": [],
"internalPorts": [], "internal_ports": [],
"environment": [ "environment": [
"CONTAINER_TO_UPDATE=nextcloud-aio-mastercontainer" "CONTAINER_TO_UPDATE=nextcloud-aio-mastercontainer"
], ],
@ -349,7 +349,7 @@
"ports": [ "ports": [
"%APACHE_PORT%/tcp" "%APACHE_PORT%/tcp"
], ],
"internalPorts": [], "internal_ports": [],
"environment": [ "environment": [
"INSTANCE_ID=%INSTANCE_ID%", "INSTANCE_ID=%INSTANCE_ID%",
"APACHE_PORT=%APACHE_PORT%" "APACHE_PORT=%APACHE_PORT%"
@ -367,7 +367,7 @@
"display_name": "ClamAV", "display_name": "ClamAV",
"image": "nextcloud/aio-clamav", "image": "nextcloud/aio-clamav",
"ports": [], "ports": [],
"internalPorts": [ "internal_ports": [
"3310" "3310"
], ],
"environment": [ "environment": [
@ -391,7 +391,7 @@
"display_name": "OnlyOffice", "display_name": "OnlyOffice",
"image": "nextcloud/aio-onlyoffice", "image": "nextcloud/aio-onlyoffice",
"ports": [], "ports": [],
"internalPorts": [ "internal_ports": [
"80" "80"
], ],
"environment": [ "environment": [
@ -419,7 +419,7 @@
"display_name": "Imaginary", "display_name": "Imaginary",
"image": "nextcloud/aio-imaginary", "image": "nextcloud/aio-imaginary",
"ports": [], "ports": [],
"internalPorts": [ "internal_ports": [
"9000" "9000"
], ],
"environment": [ "environment": [
@ -436,7 +436,7 @@
"display_name": "Fulltextsearch", "display_name": "Fulltextsearch",
"image": "nextcloud/aio-fulltextsearch", "image": "nextcloud/aio-fulltextsearch",
"ports": [], "ports": [],
"internalPorts": [ "internal_ports": [
"9200" "9200"
], ],
"environment": [ "environment": [

2
php/src/ContainerDefinitionFetcher.php
View file

@ -88,7 +88,7 @@ class ContainerDefinitionFetcher
} }
$internalPorts = new ContainerInternalPorts(); $internalPorts = new ContainerInternalPorts();
foreach ($entry['internalPorts'] as $internalPort) { foreach ($entry['internal_ports'] as $internalPort) {
if($internalPort === '%APACHE_PORT%') { if($internalPort === '%APACHE_PORT%') {
$internalPort = $this->configurationManager->GetApachePort(); $internalPort = $this->configurationManager->GetApachePort();
} elseif($internalPort === '%TALK_PORT%') { } elseif($internalPort === '%TALK_PORT%') {