eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-15 02:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge f9198b4ab2 into ba899255c1

Browse source
This commit is contained in:
Keith Wansbrough 2026-01-28 08:35:42 +09:00 • committed by GitHub
commit 001f0b31c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
php/src/Data/ConfigurationManager.php
View file

@ -763,6 +763,14 @@ class ConfigurationManager
return trim($this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue));
}
public function GetCollaboraExtraHosts() : string {
$envVariableName = 'COLLABORA_EXTRA_HOSTS';
$configName = 'collabora_extra_hosts';
$defaultValue = '';
$value = trim($this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue));
return preg_split('/ +/', $value, -1, PREG_SPLIT_NO_EMPTY);
}
public function GetCollaboraSeccompPolicy() : string {
$defaultString = '--o:security.seccomp=';
if (!$this->isSeccompDisabled()) {

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

@ -430,6 +430,10 @@ readonly class DockerActionManager {
if ($this->configurationManager->GetAdditionalCollaboraOptions() !== '') {
$requestBody['Cmd'] = [$this->configurationManager->GetAdditionalCollaboraOptions()];
}
if (count($this->configurationManager->GetCollaboraExtraHosts()) > 0) {
$requestBody['HostConfig']['ExtraHosts'] = $this->configurationManager->GetCollaboraExtraHosts();
}
}
if (count($mounts) > 0) {