From e8b85917c0bb327235072e6f0ba23b2892a6c69e Mon Sep 17 00:00:00 2001 From: Simon L Date: Sat, 3 Jun 2023 18:05:29 +0200 Subject: [PATCH] try to speed up initial login by not removing the bridge network from mastercontainer but instead during cron.sh Signed-off-by: Simon L --- Containers/mastercontainer/cron.sh | 5 +++++ php/src/Docker/DockerActionManager.php | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Containers/mastercontainer/cron.sh b/Containers/mastercontainer/cron.sh index 03e5a724..384b1604 100644 --- a/Containers/mastercontainer/cron.sh +++ b/Containers/mastercontainer/cron.sh @@ -57,6 +57,11 @@ while true; do # Remove dangling images sudo -u www-data docker image prune --force + # Remove mastercontainer from default bridge network + if sudo -u www-data docker inspect nextcloud-aio-mastercontainer --format "{{.NetworkSettings.Networks}}" | grep -q "bridge"; then + sudo -u www-data docker network disconnect bridge nextcloud-aio-mastercontainer + fi + # Wait 60s so that the whole loop will not be executed again sleep 60 done diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php index 903f912b..283972aa 100644 --- a/php/src/Docker/DockerActionManager.php +++ b/php/src/Docker/DockerActionManager.php @@ -768,7 +768,8 @@ class DockerActionManager public function ConnectMasterContainerToNetwork() : void { $this->ConnectContainerIdToNetwork('nextcloud-aio-mastercontainer', ''); - $this->DisconnectContainerFromBridgeNetwork('nextcloud-aio-mastercontainer'); + // Don't disconnect here since it slows down the initial login by a lot. Is getting done during cron.sh instead. + // $this->DisconnectContainerFromBridgeNetwork('nextcloud-aio-mastercontainer'); } public function ConnectContainerToNetwork(Container $container) : void