daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-05-21 10:50:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1603 from nextcloud/enh/noid/refactor-volumes

Browse Source 
substitute volume variables in dockeractionmanager
This commit is contained in:
Simon L
2022-12-29 10:33:57 +01:00
committed by GitHub
parent 13ca2a35a8 b5e40dbb94
commit 417c6771c8
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
php/src/ContainerDefinitionFetcher.php
View File

@@ -94,39 +94,6 @@ class ContainerDefinitionFetcher
$volumes = new ContainerVolumes();
foreach ($entry['volumes'] as $value) {
if($value['name'] === '%BORGBACKUP_HOST_LOCATION%') {
$value['name'] = $this->configurationManager->GetBorgBackupHostLocation();
if($value['name'] === '') {
continue;
}
}
if($value['name'] === '%NEXTCLOUD_MOUNT%') {
$value['name'] = $this->configurationManager->GetNextcloudMount();
if($value['name'] === '') {
continue;
}
} elseif ($value['name'] === '%NEXTCLOUD_DATADIR%') {
$value['name'] = $this->configurationManager->GetNextcloudDatadirMount();
if ($value['name'] === '') {
continue;
}
} elseif ($value['name'] === '%DOCKER_SOCKET_PATH%') {
$value['name'] = $this->configurationManager->GetDockerSocketPath();
if($value['name'] === '') {
continue;
}
} elseif ($value['name'] === '%NEXTCLOUD_TRUSTED_CACERTS_DIR%') {
$value['name'] = $this->configurationManager->GetTrustedCacertsDir();
if($value['name'] === '') {
continue;
}
}
if ($value['location'] === '%NEXTCLOUD_MOUNT%') {
$value['location'] = $this->configurationManager->GetNextcloudMount();
if($value['location'] === '') {
continue;
}
}
$volumes->AddVolume(
new ContainerVolume(
$value['name'],

34
php/src/Docker/DockerActionManager.php
View File

@@ -205,6 +205,40 @@ class DockerActionManager
public function CreateContainer(Container $container) : void {
$volumes = [];
foreach($container->GetVolumes()->GetVolumes() as $volume) {
if($volume->name === '%BORGBACKUP_HOST_LOCATION%') {
$volume->name = $this->configurationManager->GetBorgBackupHostLocation();
if($volume->name === '') {
continue;
}
}
if($volume->name === '%NEXTCLOUD_MOUNT%') {
$volume->name = $this->configurationManager->GetNextcloudMount();
if($volume->name === '') {
continue;
}
} elseif ($volume->name === '%NEXTCLOUD_DATADIR%') {
$volume->name = $this->configurationManager->GetNextcloudDatadirMount();
if ($volume->name === '') {
continue;
}
} elseif ($volume->name === '%DOCKER_SOCKET_PATH%') {
$volume->name = $this->configurationManager->GetDockerSocketPath();
if($volume->name === '') {
continue;
}
} elseif ($volume->name === '%NEXTCLOUD_TRUSTED_CACERTS_DIR%') {
$volume->name = $this->configurationManager->GetTrustedCacertsDir();
if($volume->name === '') {
continue;
}
}
if ($volume->mountPoint === '%NEXTCLOUD_MOUNT%') {
$volume->mountPoint = $this->configurationManager->GetNextcloudMount();
if($volume->mountPoint === '') {
continue;
}
}
$volumeEntry = $volume->name . ':' . $volume->mountPoint;
if($volume->isWritable) {
$volumeEntry = $volumeEntry . ':' . 'rw';