From 7720ed50616872af3375ee07a4fcb55bab9bde98 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 00:36:19 +0100 Subject: [PATCH 01/11] rename identifier to container_name Signed-off-by: Simon L --- manual-install/update-yaml.sh | 7 +++---- php/containers-schema.json | 2 +- php/containers.json | 26 +++++++++++++------------- php/src/ContainerDefinitionFetcher.php | 14 +++++++------- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index ac6a9ae9..b5ad664c 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -7,9 +7,9 @@ sed -i 's|","writeable":true|:rw"|g' /tmp/containers.json OUTPUT="$(cat /tmp/containers.json)" OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].internalPorts)')" 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(.identifier == "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-watchtower"))')" +OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.container_name == "nextcloud-aio-domaincheck"))')" +OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.container_name == "nextcloud-aio-borgbackup"))')" snap install yq mkdir -p ./manual-install @@ -18,7 +18,6 @@ echo "$OUTPUT" | yq -P > ./manual-install/containers.yml cd manual-install || exit sed -i "s|'||g" 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|environmentVariables:|environment:|' containers.yml sed -i '/displayName:/d' containers.yml diff --git a/php/containers-schema.json b/php/containers-schema.json index 1a668d38..69894f0c 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -29,7 +29,7 @@ "type": "string" } }, - "identifier": { + "container_name": { "type": "string" }, "internalPorts": { diff --git a/php/containers.json b/php/containers.json index 77bbcb76..90a143cd 100644 --- a/php/containers.json +++ b/php/containers.json @@ -1,7 +1,7 @@ { "production": [ { - "identifier": "nextcloud-aio-apache", + "container_name": "nextcloud-aio-apache", "dependsOn": [ "nextcloud-aio-onlyoffice", "nextcloud-aio-collabora", @@ -44,7 +44,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-database", + "container_name": "nextcloud-aio-database", "dependsOn": [], "displayName": "Database", "containerName": "nextcloud/aio-postgresql", @@ -78,7 +78,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-nextcloud", + "container_name": "nextcloud-aio-nextcloud", "dependsOn": [ "nextcloud-aio-database", "nextcloud-aio-redis", @@ -166,7 +166,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-redis", + "container_name": "nextcloud-aio-redis", "dependsOn": [], "displayName": "Redis", "containerName": "nextcloud/aio-redis", @@ -193,7 +193,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-collabora", + "container_name": "nextcloud-aio-collabora", "dependsOn": [], "displayName": "Collabora", "containerName": "nextcloud/aio-collabora", @@ -219,7 +219,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-talk", + "container_name": "nextcloud-aio-talk", "dependsOn": [], "displayName": "Talk", "containerName": "nextcloud/aio-talk", @@ -248,7 +248,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-borgbackup", + "container_name": "nextcloud-aio-borgbackup", "dependsOn": [], "displayName": "Borgbackup", "containerName": "nextcloud/aio-borgbackup", @@ -321,7 +321,7 @@ "restartPolicy": "" }, { - "identifier": "nextcloud-aio-watchtower", + "container_name": "nextcloud-aio-watchtower", "dependsOn": [], "displayName": "Watchtower", "containerName": "nextcloud/aio-watchtower", @@ -343,7 +343,7 @@ }, { "dependsOn": [], - "identifier": "nextcloud-aio-domaincheck", + "container_name": "nextcloud-aio-domaincheck", "displayName": "Domaincheck", "containerName": "nextcloud/aio-domaincheck", "ports": [ @@ -362,7 +362,7 @@ "restartPolicy": "" }, { - "identifier": "nextcloud-aio-clamav", + "container_name": "nextcloud-aio-clamav", "dependsOn": [], "displayName": "ClamAV", "containerName": "nextcloud/aio-clamav", @@ -386,7 +386,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-onlyoffice", + "container_name": "nextcloud-aio-onlyoffice", "dependsOn": [], "displayName": "OnlyOffice", "containerName": "nextcloud/aio-onlyoffice", @@ -414,7 +414,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-imaginary", + "container_name": "nextcloud-aio-imaginary", "dependsOn": [], "displayName": "Imaginary", "containerName": "nextcloud/aio-imaginary", @@ -431,7 +431,7 @@ "restartPolicy": "unless-stopped" }, { - "identifier": "nextcloud-aio-fulltextsearch", + "container_name": "nextcloud-aio-fulltextsearch", "dependsOn": [], "displayName": "Fulltextsearch", "containerName": "nextcloud/aio-fulltextsearch", diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index f2d30804..6c5266d4 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -49,27 +49,27 @@ class ContainerDefinitionFetcher $containers = []; foreach ($data['production'] as $entry) { - if ($entry['identifier'] === 'nextcloud-aio-clamav') { + if ($entry['container_name'] === 'nextcloud-aio-clamav') { if (!$this->configurationManager->isClamavEnabled()) { continue; } - } elseif ($entry['identifier'] === 'nextcloud-aio-onlyoffice') { + } elseif ($entry['container_name'] === 'nextcloud-aio-onlyoffice') { if (!$this->configurationManager->isOnlyofficeEnabled()) { continue; } - } elseif ($entry['identifier'] === 'nextcloud-aio-collabora') { + } elseif ($entry['container_name'] === 'nextcloud-aio-collabora') { if (!$this->configurationManager->isCollaboraEnabled()) { continue; } - } elseif ($entry['identifier'] === 'nextcloud-aio-talk') { + } elseif ($entry['container_name'] === 'nextcloud-aio-talk') { if (!$this->configurationManager->isTalkEnabled()) { continue; } - } elseif ($entry['identifier'] === 'nextcloud-aio-imaginary') { + } elseif ($entry['container_name'] === 'nextcloud-aio-imaginary') { if (!$this->configurationManager->isImaginaryEnabled()) { continue; } - } elseif ($entry['identifier'] === 'nextcloud-aio-fulltextsearch') { + } elseif ($entry['container_name'] === 'nextcloud-aio-fulltextsearch') { if (!$this->configurationManager->isFulltextsearchEnabled()) { continue; } @@ -177,7 +177,7 @@ class ContainerDefinitionFetcher } $containers[] = new Container( - $entry['identifier'], + $entry['container_name'], $entry['displayName'], $entry['containerName'], $entry['restartPolicy'], From 6cca3ceb6c3707f1da04b7cad1fecdc0baf9f075 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 00:39:22 +0100 Subject: [PATCH 02/11] rename dependsOn to depends_on Signed-off-by: Simon L --- manual-install/update-yaml.sh | 1 - php/containers-schema.json | 2 +- php/containers.json | 26 +++++++++++++------------- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index b5ad664c..fc1c20ae 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -25,7 +25,6 @@ sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i 's|containerName:|image:|' containers.yml sed -i '/: \[\]/d' containers.yml -sed -i 's|dependsOn:|depends_on:|' containers.yml sed -i 's|- name: |- |' containers.yml TCP="$(grep -oP '[%A-Z0-9_]+/tcp' containers.yml | sort -u)" diff --git a/php/containers-schema.json b/php/containers-schema.json index 69894f0c..2df81a93 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -14,7 +14,7 @@ "containerName": { "type": "string" }, - "dependsOn": { + "depends_on": { "type": "array", "items": { "type": "string" diff --git a/php/containers.json b/php/containers.json index 90a143cd..3c436062 100644 --- a/php/containers.json +++ b/php/containers.json @@ -2,7 +2,7 @@ "production": [ { "container_name": "nextcloud-aio-apache", - "dependsOn": [ + "depends_on": [ "nextcloud-aio-onlyoffice", "nextcloud-aio-collabora", "nextcloud-aio-talk", @@ -45,7 +45,7 @@ }, { "container_name": "nextcloud-aio-database", - "dependsOn": [], + "depends_on": [], "displayName": "Database", "containerName": "nextcloud/aio-postgresql", "ports": [], @@ -79,7 +79,7 @@ }, { "container_name": "nextcloud-aio-nextcloud", - "dependsOn": [ + "depends_on": [ "nextcloud-aio-database", "nextcloud-aio-redis", "nextcloud-aio-clamav", @@ -167,7 +167,7 @@ }, { "container_name": "nextcloud-aio-redis", - "dependsOn": [], + "depends_on": [], "displayName": "Redis", "containerName": "nextcloud/aio-redis", "ports": [], @@ -194,7 +194,7 @@ }, { "container_name": "nextcloud-aio-collabora", - "dependsOn": [], + "depends_on": [], "displayName": "Collabora", "containerName": "nextcloud/aio-collabora", "ports": [], @@ -220,7 +220,7 @@ }, { "container_name": "nextcloud-aio-talk", - "dependsOn": [], + "depends_on": [], "displayName": "Talk", "containerName": "nextcloud/aio-talk", "ports": [ @@ -249,7 +249,7 @@ }, { "container_name": "nextcloud-aio-borgbackup", - "dependsOn": [], + "depends_on": [], "displayName": "Borgbackup", "containerName": "nextcloud/aio-borgbackup", "ports": [], @@ -322,7 +322,7 @@ }, { "container_name": "nextcloud-aio-watchtower", - "dependsOn": [], + "depends_on": [], "displayName": "Watchtower", "containerName": "nextcloud/aio-watchtower", "ports": [], @@ -342,7 +342,7 @@ "restartPolicy": "" }, { - "dependsOn": [], + "depends_on": [], "container_name": "nextcloud-aio-domaincheck", "displayName": "Domaincheck", "containerName": "nextcloud/aio-domaincheck", @@ -363,7 +363,7 @@ }, { "container_name": "nextcloud-aio-clamav", - "dependsOn": [], + "depends_on": [], "displayName": "ClamAV", "containerName": "nextcloud/aio-clamav", "ports": [], @@ -387,7 +387,7 @@ }, { "container_name": "nextcloud-aio-onlyoffice", - "dependsOn": [], + "depends_on": [], "displayName": "OnlyOffice", "containerName": "nextcloud/aio-onlyoffice", "ports": [], @@ -415,7 +415,7 @@ }, { "container_name": "nextcloud-aio-imaginary", - "dependsOn": [], + "depends_on": [], "displayName": "Imaginary", "containerName": "nextcloud/aio-imaginary", "ports": [], @@ -432,7 +432,7 @@ }, { "container_name": "nextcloud-aio-fulltextsearch", - "dependsOn": [], + "depends_on": [], "displayName": "Fulltextsearch", "containerName": "nextcloud/aio-fulltextsearch", "ports": [], diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 6c5266d4..3e2f21fd 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -142,7 +142,7 @@ class ContainerDefinitionFetcher } $dependsOn = []; - foreach ($entry['dependsOn'] as $value) { + foreach ($entry['depends_on'] as $value) { if ($value === 'nextcloud-aio-clamav') { if (!$this->configurationManager->isClamavEnabled()) { continue; From 4a69d53a67a2893951cd9afed461996586e91f57 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 00:43:26 +0100 Subject: [PATCH 03/11] rename containerName to image Signed-off-by: Simon L --- manual-install/update-yaml.sh | 1 - php/containers-schema.json | 2 +- php/containers.json | 26 +++++++++++++------------- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index fc1c20ae..3b82bcaf 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -23,7 +23,6 @@ sed -i 's|environmentVariables:|environment:|' containers.yml sed -i '/displayName:/d' containers.yml sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml -sed -i 's|containerName:|image:|' containers.yml sed -i '/: \[\]/d' containers.yml sed -i 's|- name: |- |' containers.yml diff --git a/php/containers-schema.json b/php/containers-schema.json index 2df81a93..ba355dbe 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -11,7 +11,7 @@ "additionalProperties": false, "minProperties": 11, "properties": { - "containerName": { + "image": { "type": "string" }, "depends_on": { diff --git a/php/containers.json b/php/containers.json index 3c436062..a0a9a26e 100644 --- a/php/containers.json +++ b/php/containers.json @@ -9,7 +9,7 @@ "nextcloud-aio-nextcloud" ], "displayName": "Apache", - "containerName": "nextcloud/aio-apache", + "image": "nextcloud/aio-apache", "ports": [ "%APACHE_PORT%/tcp" ], @@ -47,7 +47,7 @@ "container_name": "nextcloud-aio-database", "depends_on": [], "displayName": "Database", - "containerName": "nextcloud/aio-postgresql", + "image": "nextcloud/aio-postgresql", "ports": [], "internalPorts": [ "5432" @@ -87,7 +87,7 @@ "nextcloud-aio-imaginary" ], "displayName": "Nextcloud", - "containerName": "nextcloud/aio-nextcloud", + "image": "nextcloud/aio-nextcloud", "ports": [], "internalPorts": [ "9000" @@ -169,7 +169,7 @@ "container_name": "nextcloud-aio-redis", "depends_on": [], "displayName": "Redis", - "containerName": "nextcloud/aio-redis", + "image": "nextcloud/aio-redis", "ports": [], "internalPorts": [ "6379" @@ -196,7 +196,7 @@ "container_name": "nextcloud-aio-collabora", "depends_on": [], "displayName": "Collabora", - "containerName": "nextcloud/aio-collabora", + "image": "nextcloud/aio-collabora", "ports": [], "internalPorts": [ "9980" @@ -222,7 +222,7 @@ "container_name": "nextcloud-aio-talk", "depends_on": [], "displayName": "Talk", - "containerName": "nextcloud/aio-talk", + "image": "nextcloud/aio-talk", "ports": [ "%TALK_PORT%/tcp", "%TALK_PORT%/udp" @@ -251,7 +251,7 @@ "container_name": "nextcloud-aio-borgbackup", "depends_on": [], "displayName": "Borgbackup", - "containerName": "nextcloud/aio-borgbackup", + "image": "nextcloud/aio-borgbackup", "ports": [], "internalPorts": [], "environmentVariables": [ @@ -324,7 +324,7 @@ "container_name": "nextcloud-aio-watchtower", "depends_on": [], "displayName": "Watchtower", - "containerName": "nextcloud/aio-watchtower", + "image": "nextcloud/aio-watchtower", "ports": [], "internalPorts": [], "environmentVariables": [ @@ -345,7 +345,7 @@ "depends_on": [], "container_name": "nextcloud-aio-domaincheck", "displayName": "Domaincheck", - "containerName": "nextcloud/aio-domaincheck", + "image": "nextcloud/aio-domaincheck", "ports": [ "%APACHE_PORT%/tcp" ], @@ -365,7 +365,7 @@ "container_name": "nextcloud-aio-clamav", "depends_on": [], "displayName": "ClamAV", - "containerName": "nextcloud/aio-clamav", + "image": "nextcloud/aio-clamav", "ports": [], "internalPorts": [ "3310" @@ -389,7 +389,7 @@ "container_name": "nextcloud-aio-onlyoffice", "depends_on": [], "displayName": "OnlyOffice", - "containerName": "nextcloud/aio-onlyoffice", + "image": "nextcloud/aio-onlyoffice", "ports": [], "internalPorts": [ "80" @@ -417,7 +417,7 @@ "container_name": "nextcloud-aio-imaginary", "depends_on": [], "displayName": "Imaginary", - "containerName": "nextcloud/aio-imaginary", + "image": "nextcloud/aio-imaginary", "ports": [], "internalPorts": [ "9000" @@ -434,7 +434,7 @@ "container_name": "nextcloud-aio-fulltextsearch", "depends_on": [], "displayName": "Fulltextsearch", - "containerName": "nextcloud/aio-fulltextsearch", + "image": "nextcloud/aio-fulltextsearch", "ports": [], "internalPorts": [ "9200" diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 3e2f21fd..8266125c 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -179,7 +179,7 @@ class ContainerDefinitionFetcher $containers[] = new Container( $entry['container_name'], $entry['displayName'], - $entry['containerName'], + $entry['image'], $entry['restartPolicy'], $entry['maxShutdownTime'], $ports, From b13cb77ce20f421ed9a59a16f23d47e76e913524 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 00:48:24 +0100 Subject: [PATCH 04/11] rename environmentVariables to environment Signed-off-by: Simon L --- manual-install/update-yaml.sh | 1 - php/containers-schema.json | 2 +- php/containers.json | 26 +++++++++++++------------- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 3b82bcaf..1a9cdc71 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -19,7 +19,6 @@ cd manual-install || exit sed -i "s|'||g" containers.yml sed -i 's|production:|services:|' containers.yml sed -i 's|restartPolicy:|restart:|' containers.yml -sed -i 's|environmentVariables:|environment:|' containers.yml sed -i '/displayName:/d' containers.yml sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml diff --git a/php/containers-schema.json b/php/containers-schema.json index ba355dbe..4d252186 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -23,7 +23,7 @@ "displayName": { "type": "string" }, - "environmentVariables": { + "environment": { "type": "array", "items": { "type": "string" diff --git a/php/containers.json b/php/containers.json index a0a9a26e..aebac146 100644 --- a/php/containers.json +++ b/php/containers.json @@ -17,7 +17,7 @@ "%APACHE_PORT%" ], "secrets": [], - "environmentVariables": [ + "environment": [ "NC_DOMAIN=%NC_DOMAIN%", "NEXTCLOUD_HOST=nextcloud-aio-nextcloud", "COLLABORA_HOST=nextcloud-aio-collabora", @@ -67,7 +67,7 @@ "writeable": true } ], - "environmentVariables": [ + "environment": [ "POSTGRES_PASSWORD=%DATABASE_PASSWORD%", "POSTGRES_DB=nextcloud_database", "POSTGRES_USER=nextcloud", @@ -121,7 +121,7 @@ "writeable": false } ], - "environmentVariables": [ + "environment": [ "POSTGRES_HOST=nextcloud-aio-database", "POSTGRES_PASSWORD=%DATABASE_PASSWORD%", "POSTGRES_DB=nextcloud_database", @@ -174,7 +174,7 @@ "internalPorts": [ "6379" ], - "environmentVariables": [ + "environment": [ "REDIS_HOST_PASSWORD=%REDIS_PASSWORD%", "TZ=%TIMEZONE%" ], @@ -201,7 +201,7 @@ "internalPorts": [ "9980" ], - "environmentVariables": [ + "environment": [ "aliasgroup1=https://%NC_DOMAIN%:443", "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY%", "dictionaries=%COLLABORA_DICTIONARIES%", @@ -230,7 +230,7 @@ "internalPorts": [ "%TALK_PORT%" ], - "environmentVariables": [ + "environment": [ "NC_DOMAIN=%NC_DOMAIN%", "TURN_SECRET=%TURN_SECRET%", "SIGNALING_SECRET=%SIGNALING_SECRET%", @@ -254,7 +254,7 @@ "image": "nextcloud/aio-borgbackup", "ports": [], "internalPorts": [], - "environmentVariables": [ + "environment": [ "BORG_PASSWORD=%BORGBACKUP_PASSWORD%", "BORG_MODE=%BORGBACKUP_MODE%", "SELECTED_RESTORE_TIME=%SELECTED_RESTORE_TIME%", @@ -327,7 +327,7 @@ "image": "nextcloud/aio-watchtower", "ports": [], "internalPorts": [], - "environmentVariables": [ + "environment": [ "CONTAINER_TO_UPDATE=nextcloud-aio-mastercontainer" ], "volumes": [ @@ -350,7 +350,7 @@ "%APACHE_PORT%/tcp" ], "internalPorts": [], - "environmentVariables": [ + "environment": [ "INSTANCE_ID=%INSTANCE_ID%", "APACHE_PORT=%APACHE_PORT%" ], @@ -370,7 +370,7 @@ "internalPorts": [ "3310" ], - "environmentVariables": [ + "environment": [ "TZ=%TIMEZONE%", "CLAMD_STARTUP_TIMEOUT=90" ], @@ -394,7 +394,7 @@ "internalPorts": [ "80" ], - "environmentVariables": [ + "environment": [ "TZ=%TIMEZONE%", "JWT_ENABLED=true", "JWT_HEADER=AuthorizationJwt", @@ -422,7 +422,7 @@ "internalPorts": [ "9000" ], - "environmentVariables": [ + "environment": [ "TZ=%TIMEZONE%" ], "volumes": [], @@ -439,7 +439,7 @@ "internalPorts": [ "9200" ], - "environmentVariables": [ + "environment": [ "TZ=%TIMEZONE%", "discovery.type=single-node", "ES_JAVA_OPTS=-Xms1024M -Xmx1024M" diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 8266125c..d4244566 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -172,7 +172,7 @@ class ContainerDefinitionFetcher } $variables = new ContainerEnvironmentVariables(); - foreach ($entry['environmentVariables'] as $value) { + foreach ($entry['environment'] as $value) { $variables->AddVariable($value); } From 5c444472c7fe32f188b8a58a32b776cbcc6694a3 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 00:50:17 +0100 Subject: [PATCH 05/11] rename maxShutdownTime to stop_grace_period Signed-off-by: Simon L --- manual-install/update-yaml.sh | 1 - php/containers-schema.json | 2 +- php/containers.json | 26 +++++++++++++------------- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 1a9cdc71..66586964 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -20,7 +20,6 @@ sed -i "s|'||g" containers.yml sed -i 's|production:|services:|' containers.yml sed -i 's|restartPolicy:|restart:|' containers.yml sed -i '/displayName:/d' containers.yml -sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i '/: \[\]/d' containers.yml sed -i 's|- name: |- |' containers.yml diff --git a/php/containers-schema.json b/php/containers-schema.json index 4d252186..43b5dd40 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -38,7 +38,7 @@ "type": "string" } }, - "maxShutdownTime": { + "stop_grace_period": { "type": "integer" }, "ports": { diff --git a/php/containers.json b/php/containers.json index aebac146..31b51adc 100644 --- a/php/containers.json +++ b/php/containers.json @@ -40,7 +40,7 @@ "writeable": true } ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -74,7 +74,7 @@ "TZ=%TIMEZONE%", "PGTZ=%TIMEZONE%" ], - "maxShutdownTime": 1800, + "stop_grace_period": 1800, "restartPolicy": "unless-stopped" }, { @@ -162,7 +162,7 @@ "ADDITIONAL_APKS=%NEXTCLOUD_ADDITIONAL_APKS%", "ADDITIONAL_PHP_EXTENSIONS=%NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS%" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -189,7 +189,7 @@ "REDIS_PASSWORD", "ONLYOFFICE_SECRET" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -215,7 +215,7 @@ } ], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -244,7 +244,7 @@ "SIGNALING_SECRET", "JANUS_API_KEY" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -317,7 +317,7 @@ "secrets": [ "BORGBACKUP_PASSWORD" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "" }, { @@ -338,7 +338,7 @@ } ], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "" }, { @@ -358,7 +358,7 @@ "secrets": [ "INSTANCE_ID" ], - "maxShutdownTime": 1, + "stop_grace_period": 1, "restartPolicy": "" }, { @@ -382,7 +382,7 @@ } ], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -410,7 +410,7 @@ "secrets": [ "ONLYOFFICE_SECRET" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -427,7 +427,7 @@ ], "volumes": [], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -452,7 +452,7 @@ } ], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" } ] diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index d4244566..a144f641 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -181,7 +181,7 @@ class ContainerDefinitionFetcher $entry['displayName'], $entry['image'], $entry['restartPolicy'], - $entry['maxShutdownTime'], + $entry['stop_grace_period'], $ports, $internalPorts, $volumes, From 1e78d729c4487d428bf553e0cd9c77b59db3c3d6 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 00:52:01 +0100 Subject: [PATCH 06/11] rename restartPolicy to restart Signed-off-by: Simon L --- manual-install/update-yaml.sh | 1 - php/containers-schema.json | 2 +- php/containers.json | 26 +++++++++++++------------- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 66586964..4589ce23 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -18,7 +18,6 @@ echo "$OUTPUT" | yq -P > ./manual-install/containers.yml cd manual-install || exit sed -i "s|'||g" containers.yml sed -i 's|production:|services:|' containers.yml -sed -i 's|restartPolicy:|restart:|' containers.yml sed -i '/displayName:/d' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i '/: \[\]/d' containers.yml diff --git a/php/containers-schema.json b/php/containers-schema.json index 43b5dd40..34e5f817 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -47,7 +47,7 @@ "type": "string" } }, - "restartPolicy": { + "restart": { "type": "string" }, "secrets": { diff --git a/php/containers.json b/php/containers.json index 31b51adc..a2cfa57b 100644 --- a/php/containers.json +++ b/php/containers.json @@ -41,7 +41,7 @@ } ], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-database", @@ -75,7 +75,7 @@ "PGTZ=%TIMEZONE%" ], "stop_grace_period": 1800, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-nextcloud", @@ -163,7 +163,7 @@ "ADDITIONAL_PHP_EXTENSIONS=%NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS%" ], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-redis", @@ -190,7 +190,7 @@ "ONLYOFFICE_SECRET" ], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-collabora", @@ -216,7 +216,7 @@ ], "secrets": [], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-talk", @@ -245,7 +245,7 @@ "JANUS_API_KEY" ], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-borgbackup", @@ -318,7 +318,7 @@ "BORGBACKUP_PASSWORD" ], "stop_grace_period": 10, - "restartPolicy": "" + "restart": "" }, { "container_name": "nextcloud-aio-watchtower", @@ -339,7 +339,7 @@ ], "secrets": [], "stop_grace_period": 10, - "restartPolicy": "" + "restart": "" }, { "depends_on": [], @@ -359,7 +359,7 @@ "INSTANCE_ID" ], "stop_grace_period": 1, - "restartPolicy": "" + "restart": "" }, { "container_name": "nextcloud-aio-clamav", @@ -383,7 +383,7 @@ ], "secrets": [], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-onlyoffice", @@ -411,7 +411,7 @@ "ONLYOFFICE_SECRET" ], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-imaginary", @@ -428,7 +428,7 @@ "volumes": [], "secrets": [], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" }, { "container_name": "nextcloud-aio-fulltextsearch", @@ -453,7 +453,7 @@ ], "secrets": [], "stop_grace_period": 10, - "restartPolicy": "unless-stopped" + "restart": "unless-stopped" } ] } diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index a144f641..60088f42 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -180,7 +180,7 @@ class ContainerDefinitionFetcher $entry['container_name'], $entry['displayName'], $entry['image'], - $entry['restartPolicy'], + $entry['restart'], $entry['stop_grace_period'], $ports, $internalPorts, From 3c57b2db56350429968e9e8b1f0d573a11a6705b Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 00:55:54 +0100 Subject: [PATCH 07/11] rename displayName to display_name Signed-off-by: Simon L --- manual-install/update-yaml.sh | 2 +- php/containers-schema.json | 2 +- php/containers.json | 26 +++++++++++++------------- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 4589ce23..4cccac2a 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -18,7 +18,7 @@ echo "$OUTPUT" | yq -P > ./manual-install/containers.yml cd manual-install || exit sed -i "s|'||g" containers.yml sed -i 's|production:|services:|' containers.yml -sed -i '/displayName:/d' containers.yml +sed -i '/display_name:/d' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i '/: \[\]/d' containers.yml sed -i 's|- name: |- |' containers.yml diff --git a/php/containers-schema.json b/php/containers-schema.json index 34e5f817..e654eef0 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -20,7 +20,7 @@ "type": "string" } }, - "displayName": { + "display_name": { "type": "string" }, "environment": { diff --git a/php/containers.json b/php/containers.json index a2cfa57b..2e7a9d75 100644 --- a/php/containers.json +++ b/php/containers.json @@ -8,7 +8,7 @@ "nextcloud-aio-talk", "nextcloud-aio-nextcloud" ], - "displayName": "Apache", + "display_name": "Apache", "image": "nextcloud/aio-apache", "ports": [ "%APACHE_PORT%/tcp" @@ -46,7 +46,7 @@ { "container_name": "nextcloud-aio-database", "depends_on": [], - "displayName": "Database", + "display_name": "Database", "image": "nextcloud/aio-postgresql", "ports": [], "internalPorts": [ @@ -86,7 +86,7 @@ "nextcloud-aio-fulltextsearch", "nextcloud-aio-imaginary" ], - "displayName": "Nextcloud", + "display_name": "Nextcloud", "image": "nextcloud/aio-nextcloud", "ports": [], "internalPorts": [ @@ -168,7 +168,7 @@ { "container_name": "nextcloud-aio-redis", "depends_on": [], - "displayName": "Redis", + "display_name": "Redis", "image": "nextcloud/aio-redis", "ports": [], "internalPorts": [ @@ -195,7 +195,7 @@ { "container_name": "nextcloud-aio-collabora", "depends_on": [], - "displayName": "Collabora", + "display_name": "Collabora", "image": "nextcloud/aio-collabora", "ports": [], "internalPorts": [ @@ -221,7 +221,7 @@ { "container_name": "nextcloud-aio-talk", "depends_on": [], - "displayName": "Talk", + "display_name": "Talk", "image": "nextcloud/aio-talk", "ports": [ "%TALK_PORT%/tcp", @@ -250,7 +250,7 @@ { "container_name": "nextcloud-aio-borgbackup", "depends_on": [], - "displayName": "Borgbackup", + "display_name": "Borgbackup", "image": "nextcloud/aio-borgbackup", "ports": [], "internalPorts": [], @@ -323,7 +323,7 @@ { "container_name": "nextcloud-aio-watchtower", "depends_on": [], - "displayName": "Watchtower", + "display_name": "Watchtower", "image": "nextcloud/aio-watchtower", "ports": [], "internalPorts": [], @@ -344,7 +344,7 @@ { "depends_on": [], "container_name": "nextcloud-aio-domaincheck", - "displayName": "Domaincheck", + "display_name": "Domaincheck", "image": "nextcloud/aio-domaincheck", "ports": [ "%APACHE_PORT%/tcp" @@ -364,7 +364,7 @@ { "container_name": "nextcloud-aio-clamav", "depends_on": [], - "displayName": "ClamAV", + "display_name": "ClamAV", "image": "nextcloud/aio-clamav", "ports": [], "internalPorts": [ @@ -388,7 +388,7 @@ { "container_name": "nextcloud-aio-onlyoffice", "depends_on": [], - "displayName": "OnlyOffice", + "display_name": "OnlyOffice", "image": "nextcloud/aio-onlyoffice", "ports": [], "internalPorts": [ @@ -416,7 +416,7 @@ { "container_name": "nextcloud-aio-imaginary", "depends_on": [], - "displayName": "Imaginary", + "display_name": "Imaginary", "image": "nextcloud/aio-imaginary", "ports": [], "internalPorts": [ @@ -433,7 +433,7 @@ { "container_name": "nextcloud-aio-fulltextsearch", "depends_on": [], - "displayName": "Fulltextsearch", + "display_name": "Fulltextsearch", "image": "nextcloud/aio-fulltextsearch", "ports": [], "internalPorts": [ diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 60088f42..2adce34b 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -178,7 +178,7 @@ class ContainerDefinitionFetcher $containers[] = new Container( $entry['container_name'], - $entry['displayName'], + $entry['display_name'], $entry['image'], $entry['restart'], $entry['stop_grace_period'], From 7a9a452f4576fa402dc969c309266e291338e2cf Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 00:58:09 +0100 Subject: [PATCH 08/11] rename production to services Signed-off-by: Simon L --- manual-install/update-yaml.sh | 11 +++++------ php/containers-schema.json | 2 +- php/containers.json | 2 +- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 4cccac2a..a0722af4 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -5,11 +5,11 @@ sed -i 's|","location":"|:|g' /tmp/containers.json sed -i 's|","writeable":false|:ro"|g' /tmp/containers.json sed -i 's|","writeable":true|:rw"|g' /tmp/containers.json OUTPUT="$(cat /tmp/containers.json)" -OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].internalPorts)')" -OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[].secrets)')" -OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.container_name == "nextcloud-aio-watchtower"))')" -OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.container_name == "nextcloud-aio-domaincheck"))')" -OUTPUT="$(echo "$OUTPUT" | jq 'del(.production[] | select(.container_name == "nextcloud-aio-borgbackup"))')" +OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].internalPorts)')" +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-domaincheck"))')" +OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-borgbackup"))')" snap install yq mkdir -p ./manual-install @@ -17,7 +17,6 @@ echo "$OUTPUT" | yq -P > ./manual-install/containers.yml cd manual-install || exit sed -i "s|'||g" containers.yml -sed -i 's|production:|services:|' containers.yml sed -i '/display_name:/d' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i '/: \[\]/d' containers.yml diff --git a/php/containers-schema.json b/php/containers-schema.json index e654eef0..ced642c8 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -4,7 +4,7 @@ "additionalProperties": false, "minProperties": 1, "properties": { - "production": { + "services": { "type": "array", "items": { "type": "object", diff --git a/php/containers.json b/php/containers.json index 2e7a9d75..027b4758 100644 --- a/php/containers.json +++ b/php/containers.json @@ -1,5 +1,5 @@ { - "production": [ + "services": [ { "container_name": "nextcloud-aio-apache", "depends_on": [ diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 2adce34b..7d5ac46a 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['production'] as $entry) { + foreach ($data['services'] as $entry) { if ($entry['container_name'] === 'nextcloud-aio-clamav') { if (!$this->configurationManager->isClamavEnabled()) { continue; From 53065b5631d282f36822f52e417ece4a340f2ad2 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 01:03:17 +0100 Subject: [PATCH 09/11] rename internalPorts to internal_ports Signed-off-by: Simon L --- manual-install/update-yaml.sh | 2 +- php/containers-schema.json | 2 +- php/containers.json | 26 +++++++++++++------------- php/src/ContainerDefinitionFetcher.php | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index a0722af4..9f6836a9 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -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":true|:rw"|g' /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[] | select(.container_name == "nextcloud-aio-watchtower"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')" diff --git a/php/containers-schema.json b/php/containers-schema.json index ced642c8..dfab68c3 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -32,7 +32,7 @@ "container_name": { "type": "string" }, - "internalPorts": { + "internal_ports": { "type": "array", "items": { "type": "string" diff --git a/php/containers.json b/php/containers.json index 027b4758..2ff1b4ed 100644 --- a/php/containers.json +++ b/php/containers.json @@ -13,7 +13,7 @@ "ports": [ "%APACHE_PORT%/tcp" ], - "internalPorts": [ + "internal_ports": [ "%APACHE_PORT%" ], "secrets": [], @@ -49,7 +49,7 @@ "display_name": "Database", "image": "nextcloud/aio-postgresql", "ports": [], - "internalPorts": [ + "internal_ports": [ "5432" ], "secrets": [ @@ -89,7 +89,7 @@ "display_name": "Nextcloud", "image": "nextcloud/aio-nextcloud", "ports": [], - "internalPorts": [ + "internal_ports": [ "9000" ], "secrets": [ @@ -171,7 +171,7 @@ "display_name": "Redis", "image": "nextcloud/aio-redis", "ports": [], - "internalPorts": [ + "internal_ports": [ "6379" ], "environment": [ @@ -198,7 +198,7 @@ "display_name": "Collabora", "image": "nextcloud/aio-collabora", "ports": [], - "internalPorts": [ + "internal_ports": [ "9980" ], "environment": [ @@ -227,7 +227,7 @@ "%TALK_PORT%/tcp", "%TALK_PORT%/udp" ], - "internalPorts": [ + "internal_ports": [ "%TALK_PORT%" ], "environment": [ @@ -253,7 +253,7 @@ "display_name": "Borgbackup", "image": "nextcloud/aio-borgbackup", "ports": [], - "internalPorts": [], + "internal_ports": [], "environment": [ "BORG_PASSWORD=%BORGBACKUP_PASSWORD%", "BORG_MODE=%BORGBACKUP_MODE%", @@ -326,7 +326,7 @@ "display_name": "Watchtower", "image": "nextcloud/aio-watchtower", "ports": [], - "internalPorts": [], + "internal_ports": [], "environment": [ "CONTAINER_TO_UPDATE=nextcloud-aio-mastercontainer" ], @@ -349,7 +349,7 @@ "ports": [ "%APACHE_PORT%/tcp" ], - "internalPorts": [], + "internal_ports": [], "environment": [ "INSTANCE_ID=%INSTANCE_ID%", "APACHE_PORT=%APACHE_PORT%" @@ -367,7 +367,7 @@ "display_name": "ClamAV", "image": "nextcloud/aio-clamav", "ports": [], - "internalPorts": [ + "internal_ports": [ "3310" ], "environment": [ @@ -391,7 +391,7 @@ "display_name": "OnlyOffice", "image": "nextcloud/aio-onlyoffice", "ports": [], - "internalPorts": [ + "internal_ports": [ "80" ], "environment": [ @@ -419,7 +419,7 @@ "display_name": "Imaginary", "image": "nextcloud/aio-imaginary", "ports": [], - "internalPorts": [ + "internal_ports": [ "9000" ], "environment": [ @@ -436,7 +436,7 @@ "display_name": "Fulltextsearch", "image": "nextcloud/aio-fulltextsearch", "ports": [], - "internalPorts": [ + "internal_ports": [ "9200" ], "environment": [ diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 7d5ac46a..0d93f4b5 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -88,7 +88,7 @@ class ContainerDefinitionFetcher } $internalPorts = new ContainerInternalPorts(); - foreach ($entry['internalPorts'] as $internalPort) { + foreach ($entry['internal_ports'] as $internalPort) { if($internalPort === '%APACHE_PORT%') { $internalPort = $this->configurationManager->GetApachePort(); } elseif($internalPort === '%TALK_PORT%') { From 54f61eba68c0cc8e09a78c52b2f3154f4b0e2d33 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 01:40:37 +0100 Subject: [PATCH 10/11] internal_ports should be a string and not an array Signed-off-by: Simon L --- manual-install/update-yaml.sh | 2 +- php/containers-schema.json | 7 +-- php/containers.json | 46 ++++++-------------- php/psalm-baseline.xml | 2 +- php/src/Container/Container.php | 6 +-- php/src/Container/ContainerInternalPorts.php | 19 -------- php/src/ContainerDefinitionFetcher.php | 15 +++---- php/src/Docker/DockerActionManager.php | 16 +++---- 8 files changed, 32 insertions(+), 81 deletions(-) delete mode 100644 php/src/Container/ContainerInternalPorts.php diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 9f6836a9..ad62aaa9 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -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":true|:rw"|g' /tmp/containers.json OUTPUT="$(cat /tmp/containers.json)" -OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].internal_ports)')" +OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].internal_port)')" 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-domaincheck"))')" diff --git a/php/containers-schema.json b/php/containers-schema.json index dfab68c3..1fceab26 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -32,11 +32,8 @@ "container_name": { "type": "string" }, - "internal_ports": { - "type": "array", - "items": { - "type": "string" - } + "internal_port": { + "type": "string" }, "stop_grace_period": { "type": "integer" diff --git a/php/containers.json b/php/containers.json index 2ff1b4ed..2f49c6de 100644 --- a/php/containers.json +++ b/php/containers.json @@ -13,9 +13,7 @@ "ports": [ "%APACHE_PORT%/tcp" ], - "internal_ports": [ - "%APACHE_PORT%" - ], + "internal_port": "%APACHE_PORT%", "secrets": [], "environment": [ "NC_DOMAIN=%NC_DOMAIN%", @@ -49,9 +47,7 @@ "display_name": "Database", "image": "nextcloud/aio-postgresql", "ports": [], - "internal_ports": [ - "5432" - ], + "internal_port": "5432", "secrets": [ "DATABASE_PASSWORD" ], @@ -89,9 +85,7 @@ "display_name": "Nextcloud", "image": "nextcloud/aio-nextcloud", "ports": [], - "internal_ports": [ - "9000" - ], + "internal_port": "9000", "secrets": [ "DATABASE_PASSWORD", "REDIS_PASSWORD", @@ -171,9 +165,7 @@ "display_name": "Redis", "image": "nextcloud/aio-redis", "ports": [], - "internal_ports": [ - "6379" - ], + "internal_port": "6379", "environment": [ "REDIS_HOST_PASSWORD=%REDIS_PASSWORD%", "TZ=%TIMEZONE%" @@ -198,9 +190,7 @@ "display_name": "Collabora", "image": "nextcloud/aio-collabora", "ports": [], - "internal_ports": [ - "9980" - ], + "internal_port": "9980", "environment": [ "aliasgroup1=https://%NC_DOMAIN%:443", "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY%", @@ -227,9 +217,7 @@ "%TALK_PORT%/tcp", "%TALK_PORT%/udp" ], - "internal_ports": [ - "%TALK_PORT%" - ], + "internal_port": "%TALK_PORT%", "environment": [ "NC_DOMAIN=%NC_DOMAIN%", "TURN_SECRET=%TURN_SECRET%", @@ -253,7 +241,7 @@ "display_name": "Borgbackup", "image": "nextcloud/aio-borgbackup", "ports": [], - "internal_ports": [], + "internal_port": "", "environment": [ "BORG_PASSWORD=%BORGBACKUP_PASSWORD%", "BORG_MODE=%BORGBACKUP_MODE%", @@ -326,7 +314,7 @@ "display_name": "Watchtower", "image": "nextcloud/aio-watchtower", "ports": [], - "internal_ports": [], + "internal_port": "", "environment": [ "CONTAINER_TO_UPDATE=nextcloud-aio-mastercontainer" ], @@ -349,7 +337,7 @@ "ports": [ "%APACHE_PORT%/tcp" ], - "internal_ports": [], + "internal_port": "", "environment": [ "INSTANCE_ID=%INSTANCE_ID%", "APACHE_PORT=%APACHE_PORT%" @@ -367,9 +355,7 @@ "display_name": "ClamAV", "image": "nextcloud/aio-clamav", "ports": [], - "internal_ports": [ - "3310" - ], + "internal_port": "3310", "environment": [ "TZ=%TIMEZONE%", "CLAMD_STARTUP_TIMEOUT=90" @@ -391,9 +377,7 @@ "display_name": "OnlyOffice", "image": "nextcloud/aio-onlyoffice", "ports": [], - "internal_ports": [ - "80" - ], + "internal_port": "80", "environment": [ "TZ=%TIMEZONE%", "JWT_ENABLED=true", @@ -419,9 +403,7 @@ "display_name": "Imaginary", "image": "nextcloud/aio-imaginary", "ports": [], - "internal_ports": [ - "9000" - ], + "internal_port": "9000", "environment": [ "TZ=%TIMEZONE%" ], @@ -436,9 +418,7 @@ "display_name": "Fulltextsearch", "image": "nextcloud/aio-fulltextsearch", "ports": [], - "internal_ports": [ - "9200" - ], + "internal_port": "9200", "environment": [ "TZ=%TIMEZONE%", "discovery.type=single-node", diff --git a/php/psalm-baseline.xml b/php/psalm-baseline.xml index e62c34f0..ce18679f 100644 --- a/php/psalm-baseline.xml +++ b/php/psalm-baseline.xml @@ -46,7 +46,7 @@ $internalPort - $container->GetInternalPorts() !== null + $container->GetInternalPort() !== null diff --git a/php/src/Container/Container.php b/php/src/Container/Container.php index c1330da3..9697911b 100644 --- a/php/src/Container/Container.php +++ b/php/src/Container/Container.php @@ -14,7 +14,7 @@ class Container { private string $restartPolicy; private int $maxShutdownTime; private ContainerPorts $ports; - private ContainerInternalPorts $internalPorts; + private string $internalPorts; private ContainerVolumes $volumes; private ContainerEnvironmentVariables $containerEnvironmentVariables; /** @var string[] */ @@ -30,7 +30,7 @@ class Container { string $restartPolicy, int $maxShutdownTime, ContainerPorts $ports, - ContainerInternalPorts $internalPorts, + string $internalPorts, ContainerVolumes $volumes, ContainerEnvironmentVariables $containerEnvironmentVariables, array $dependsOn, @@ -79,7 +79,7 @@ class Container { return $this->ports; } - public function GetInternalPorts() : ContainerInternalPorts { + public function GetInternalPort() : string { return $this->internalPorts; } diff --git a/php/src/Container/ContainerInternalPorts.php b/php/src/Container/ContainerInternalPorts.php deleted file mode 100644 index fb0716bf..00000000 --- a/php/src/Container/ContainerInternalPorts.php +++ /dev/null @@ -1,19 +0,0 @@ -internalPorts[] = $internalPort; - } - - /** - * @return string[] - */ - public function GetInternalPorts() : array { - return $this->internalPorts; - } -} diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 0d93f4b5..8a5341bf 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -5,7 +5,6 @@ namespace AIO; use AIO\Container\Container; use AIO\Container\ContainerEnvironmentVariables; use AIO\Container\ContainerPorts; -use AIO\Container\ContainerInternalPorts; use AIO\Container\ContainerVolume; use AIO\Container\ContainerVolumes; use AIO\Container\State\RunningState; @@ -87,14 +86,10 @@ class ContainerDefinitionFetcher $ports->AddPort($port); } - $internalPorts = new ContainerInternalPorts(); - foreach ($entry['internal_ports'] as $internalPort) { - if($internalPort === '%APACHE_PORT%') { - $internalPort = $this->configurationManager->GetApachePort(); - } elseif($internalPort === '%TALK_PORT%') { - $internalPort = $this->configurationManager->GetTalkPort(); - } - $internalPorts->AddInternalPort($internalPort); + if($entry['internal_port'] === '%APACHE_PORT%') { + $entry['internal_port'] = $this->configurationManager->GetApachePort(); + } elseif($entry['internal_port'] === '%TALK_PORT%') { + $entry['internal_port'] = $this->configurationManager->GetTalkPort(); } $volumes = new ContainerVolumes(); @@ -183,7 +178,7 @@ class ContainerDefinitionFetcher $entry['restart'], $entry['stop_grace_period'], $ports, - $internalPorts, + $entry['internal_port'], $volumes, $variables, $dependsOn, diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php index 9550dd44..eed07c35 100644 --- a/php/src/Docker/DockerActionManager.php +++ b/php/src/Docker/DockerActionManager.php @@ -124,15 +124,13 @@ class DockerActionManager } $containerName = $container->GetIdentifier(); - if ($container->GetInternalPorts() !== null) { - foreach($container->GetInternalPorts()->GetInternalPorts() as $internalPort) { - $connection = @fsockopen($containerName, $internalPort, $errno, $errstr, 0.1); - if ($connection) { - fclose($connection); - return new RunningState(); - } else { - return new StartingState(); - } + if ($container->GetInternalPort() !== "") { + $connection = @fsockopen($containerName, (int)$container->GetInternalPort(), $errno, $errstr, 0.1); + if ($connection) { + fclose($connection); + return new RunningState(); + } else { + return new StartingState(); } } else { return new RunningState(); From 117c3de7c559eef2898b49139e9c5e10bea5104c Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 25 Dec 2022 02:45:32 +0100 Subject: [PATCH 11/11] add items type for secrets Signed-off-by: Simon L --- php/containers-schema.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php/containers-schema.json b/php/containers-schema.json index 1fceab26..b13da609 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -48,7 +48,10 @@ "type": "string" }, "secrets": { - "type": "array" + "type": "array", + "items": { + "type": "string" + } }, "volumes": { "type": "array",