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

Support multiple placeholders in ENV values in containers.json

Browse source 
Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>
This commit is contained in:
Alan Savage 2025-06-19 18:14:31 -07:00 • committed by Simon L.
parent f5023ed88d
commit 026707240f
1 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
php/src/Docker/DockerActionManager.php
View file

@ -240,22 +240,7 @@ readonly class DockerActionManager {
$envs[] = $this->GetAllNextcloudExecCommands(); $envs[] = $this->GetAllNextcloudExecCommands();
} }
foreach ($envs as $key => $env) { foreach ($envs as $key => $env) {
// TODO: This whole block below is a hack and needs to get reworked in order to support multiple substitutions per line by default for all envs $envs[$key] = $this->replaceEnvPlaceholders($env);
if (str_starts_with($env, 'extra_params=')) {
$env = str_replace('%COLLABORA_SECCOMP_POLICY%', $this->configurationManager->GetCollaboraSeccompPolicy(), $env);
$env = str_replace('%NC_DOMAIN%', $this->configurationManager->GetDomain(), $env);
$envs[$key] = $env;
continue;
}
// Original implementation
$patterns = ['/%(.*)%/'];
if (preg_match($patterns[0], $env, $out) === 1) {
$replacements = array();
$replacements[1] = $this->getPlaceholderValue($out[1]);
$envs[$key] = preg_replace($patterns, $replacements, $env);
}
} }
if (count($envs) > 0) { if (count($envs) > 0) {
@ -488,6 +473,30 @@ readonly class DockerActionManager {
} }
} }
// Replaces placeholders in $envValue with their values.
// E.g. "%NC_DOMAIN%:%APACHE_PORT" becomes "my.nextcloud.com:11000"
private function replaceEnvPlaceholders($envValue) {
// $pattern breaks down as:
// % - matches a literal percent sign
// ([^%]+) - capture group that matches one or more characters that are NOT percent signs
// % - matches the closing percent sign
//
// Assumes literal percent signs are always matched and there is no
// escaping.
$pattern = '/%([^%]+)%/';
$matchCount = preg_match_all($pattern, $envValue, $matches);
if ($matchCount > 0) {
$placeholders = $matches[0]; // ["%PLACEHOLDER1%", "%PLACEHOLDER2%", ...]
$placeholderNames = $matches[1]; // ["PLACEHOLDER1", "PLACEHOLDER2", ...]
$placeholderToPattern = fn($placeholder) => '/' . $placeholder . '/';
$placeholderPatterns = array_map($placeholderToPattern, $placeholders); // ["/%PLACEHOLDER1%/", ...]
$placeholderValues = array_map([$this, 'getPlaceholderValue'], $placeholderNames); // ["val1", "val2"]
$result = preg_replace($placeholderPatterns, $placeholderValues, $envValue);
return $result;
}
return $envValue;
}
private function getPlaceholderValue($placeholder) { private function getPlaceholderValue($placeholder) {
if ($placeholder === 'NC_DOMAIN') { if ($placeholder === 'NC_DOMAIN') {
return $this->configurationManager->GetDomain(); return $this->configurationManager->GetDomain();