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

allow to set aio_variables from containers.json

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-09-29 21:44:12 +02:00
parent 49aca0d955
commit 395380ea2b
5 changed files with 56 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
php/src/ContainerDefinitionFetcher.php
View file

@ -2,6 +2,7 @@
namespace AIO;
use AIO\Container\AioVariables;
use AIO\Container\Container;
use AIO\Container\ContainerEnvironmentVariables;
use AIO\Container\ContainerPort;
@ -54,6 +55,7 @@ class ContainerDefinitionFetcher
$additionalData = json_decode(file_get_contents($path), true);
$data = array_merge_recursive($data, $additionalData);
if (isset($additionalData['aio_services_v1'][0]['display_name']) && $additionalData['aio_services_v1'][0]['display_name'] !== '') {
// Store container_name of community containers in variable for later
$additionalContainerNames[] = $additionalData['aio_services_v1'][0]['container_name'];
}
}
@ -168,9 +170,12 @@ class ContainerDefinitionFetcher
if (isset($entry['depends_on'])) {
$valueDependsOn = $entry['depends_on'];
if ($entry['container_name'] === 'nextcloud-aio-apache') {
// Add community containers first and default ones last so that aio_variables works correctly
$valueDependsOnTemp = [];
foreach ($additionalContainerNames as $containerName) {
$valueDependsOn[] = $containerName;
$valueDependsOnTemp[] = $containerName;
}
$valueDependsOn = array_merge_recursive($valueDependsOnTemp, $valueDependsOn);
}
foreach ($valueDependsOn as $value) {
if ($value === 'nextcloud-aio-clamav') {
@ -217,6 +222,13 @@ class ContainerDefinitionFetcher
}
}
$aioVariables = new AioVariables();
if (isset($entry['aio_variables'])) {
foreach ($entry['aio_variables'] as $value) {
$aioVariables->AddVariable($value);
}
}
$displayName = '';
if (isset($entry['display_name'])) {
$displayName = $entry['display_name'];
@ -314,6 +326,7 @@ class ContainerDefinitionFetcher
$tmpfs,
$init,
$imageTag,
$aioVariables,
$this->container->get(DockerActionManager::class)
);
}