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

Merge pull request #4130 from nextcloud/enh/4124/fix-borg

Browse source 
fix borg backup restore not working anymore
This commit is contained in:
Simon L 2024-01-29 09:36:16 +01:00 • committed by GitHub
commit b079c4690f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -525,12 +525,11 @@ class DockerActionManager
$requestBody['HostConfig']['CapDrop'] = ['NET_RAW']; $requestBody['HostConfig']['CapDrop'] = ['NET_RAW'];
} }
if ($container->isApparmorUnconfined()) {
$requestBody['HostConfig']['SecurityOpt'] = ["apparmor:unconfined"];
}
// Disable SELinux for AIO containers so that it does not break them // Disable SELinux for AIO containers so that it does not break them
$requestBody['HostConfig']['SecurityOpt'] = ["label:disable"]; $requestBody['HostConfig']['SecurityOpt'] = ["label:disable"];
if ($container->isApparmorUnconfined()) {
$requestBody['HostConfig']['SecurityOpt'] = ["apparmor:unconfined", "label:disable"];
}
$mounts = []; $mounts = [];