daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-06-02 00:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow to specify the docker socket path

Browse Source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen
2022-05-13 18:46:34 +02:00
parent 8764824870
commit 3db57c6290
7 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
php/containers.json
View File

@@ -283,7 +283,7 @@
],
"volumes": [
{
"name": "/var/run/docker.sock",
"name": "%DOCKER_SOCKET_PATH%",
"location": "/var/run/docker.sock",
"writeable": false
}

7
php/src/ContainerDefinitionFetcher.php
View File

@@ -101,8 +101,13 @@ class ContainerDefinitionFetcher
if ($value['name'] === '') {
continue;
}
} elseif ($value['name'] === '%DOCKER_SOCKET_PATH%') {
$value['name'] = $this->configurationManager->GetDockerSocketPath();
if($value['name'] === '') {
continue;
}
}
if($value['location'] === '%NEXTCLOUD_MOUNT%') {
if ($value['location'] === '%NEXTCLOUD_MOUNT%') {
$value['location'] = $this->configurationManager->GetNextcloudMount();
if($value['location'] === '') {
continue;

7
php/src/Data/ConfigurationManager.php
View File

@@ -453,6 +453,13 @@ class ConfigurationManager
return $this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue);
}
public function GetDockerSocketPath() : string {
$envVariableName = 'DOCKER_SOCKET_PATH';
$configName = 'docker_socket_path';
$defaultValue = '/var/run/docker.sock';
return $this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue);
}
/**
* @throws InvalidSettingConfigurationException
*/