From 9387c1cddb7e7a2a72d1e63b115ff43e7abeffd6 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Mon, 3 Jun 2024 10:58:58 +0200 Subject: [PATCH] revert "set NEXTCLOUD_MOUNT to rshared #2601" as it causes too many problems. Signed-off-by: Simon L --- php/src/Docker/DockerActionManager.php | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php index 4e56e5f0..ef3b0952 100644 --- a/php/src/Docker/DockerActionManager.php +++ b/php/src/Docker/DockerActionManager.php @@ -223,12 +223,12 @@ class DockerActionManager public function CreateContainer(Container $container) : void { $volumes = []; foreach ($container->GetVolumes()->GetVolumes() as $volume) { - // NEXTCLOUD_MOUNT gets added via bind-mount later on - if ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') { - if ($volume->name === $this->configurationManager->GetNextcloudMount()) { - continue; - } - } + // // NEXTCLOUD_MOUNT gets added via bind-mount later on + // if ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') { + // if ($volume->name === $this->configurationManager->GetNextcloudMount()) { + // continue; + // } + // } $volumeEntry = $volume->name . ':' . $volume->mountPoint; if ($volume->isWritable) { @@ -560,14 +560,14 @@ class DockerActionManager } elseif ($container->GetIdentifier() === 'nextcloud-aio-talk') { // This is needed due to a bug in libwebsockets which cannot handle unlimited ulimits $requestBody['HostConfig']['Ulimits'] = [["Name" => "nofile", "Hard" => 200000, "Soft" => 200000]]; - // Special things for the nextcloud container which should not be exposed in the containers.json - } elseif ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') { - foreach ($container->GetVolumes()->GetVolumes() as $volume) { - if ($volume->name !== $this->configurationManager->GetNextcloudMount()) { - continue; - } - $mounts[] = ["Type" => "bind", "Source" => $volume->name, "Target" => $volume->mountPoint, "ReadOnly" => !$volume->isWritable, "BindOptions" => [ "Propagation" => "rshared"]]; - } + // // Special things for the nextcloud container which should not be exposed in the containers.json + // } elseif ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') { + // foreach ($container->GetVolumes()->GetVolumes() as $volume) { + // if ($volume->name !== $this->configurationManager->GetNextcloudMount()) { + // continue; + // } + // $mounts[] = ["Type" => "bind", "Source" => $volume->name, "Target" => $volume->mountPoint, "ReadOnly" => !$volume->isWritable, "BindOptions" => [ "Propagation" => "rshared"]]; + // } // Special things for the caddy community container } elseif ($container->GetIdentifier() === 'nextcloud-aio-caddy') { $requestBody['HostConfig']['ExtraHosts'] = ['host.docker.internal:host-gateway'];