nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-10-10 15:37:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1990 from nextcloud/fix/1984/fix-docker-networks

Browse source 
connect containers only to custom network
This commit is contained in:
Simon L 2023-02-16 17:28:11 +01:00 • committed by GitHub
commit 355175cc36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -372,6 +372,7 @@ class DockerActionManager
$portWithProtocol = $value->port . '/' . $value->protocol; $portWithProtocol = $value->port . '/' . $value->protocol;
$exposedPorts[$portWithProtocol] = null; $exposedPorts[$portWithProtocol] = null;
} }
$requestBody['HostConfig']['NetworkMode'] = 'nextcloud-aio';
} else { } else {
$requestBody['HostConfig']['NetworkMode'] = 'host'; $requestBody['HostConfig']['NetworkMode'] = 'host';
} }
@ -622,11 +623,11 @@ class DockerActionManager
} }
} }
public function DisconnectContainerFromNetwork(Container $container) : void private function DisconnectContainerFromBridgeNetwork(string $id) : void
{ {
$url = $this->BuildApiUrl( $url = $this->BuildApiUrl(
sprintf('networks/%s/disconnect', 'nextcloud-aio') sprintf('networks/%s/disconnect', 'bridge')
); );
try { try {
@ -635,12 +636,11 @@ class DockerActionManager
$url, $url,
[ [
'json' => [ 'json' => [
'container' => $container->GetIdentifier(), 'container' => $id,
], ],
] ]
); );
} catch (RequestException $e) { } catch (RequestException $e) {
error_log('Could not disconnect container from network ' . $e->getMessage());
} }
} }
@ -699,6 +699,7 @@ 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');
} }
public function ConnectContainerToNetwork(Container $container) : void public function ConnectContainerToNetwork(Container $container) : void