eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

try to speed up initial login by not removing the bridge network from mastercontainer but instead during cron.sh

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-06-03 18:05:29 +02:00
parent 87381bbfa3
commit e8b85917c0
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Containers/mastercontainer/cron.sh
View file

@ -57,6 +57,11 @@ while true; do
# Remove dangling images # Remove dangling images
sudo -u www-data docker image prune --force 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 # Wait 60s so that the whole loop will not be executed again
sleep 60 sleep 60
done done

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

@ -768,7 +768,8 @@ class DockerActionManager
public function ConnectMasterContainerToNetwork() : void public function ConnectMasterContainerToNetwork() : void
{ {
$this->ConnectContainerIdToNetwork('nextcloud-aio-mastercontainer', ''); $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 public function ConnectContainerToNetwork(Container $container) : void