nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-11-01 03:31:36 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2664 from nextcloud/enh/noid/speed-up-initial-login

Browse source 
try to speed up initial login by not removing the bridge network from…
This commit is contained in:
Simon L 2023-06-06 10:32:25 +02:00 • committed by GitHub
commit b1eb97dc4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats 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

@ -774,7 +774,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