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

Merge pull request #1655 from nextcloud/enh/noid/fix-adding-containers-to-host-network

Browse source 
fix adding containers to the host network
This commit is contained in:
Simon L 2023-01-02 17:56:50 +01:00 • committed by GitHub
commit cd06678191
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -364,6 +364,8 @@ class DockerActionManager
$portWithProtocol = $value->port . '/' . $value->protocol; $portWithProtocol = $value->port . '/' . $value->protocol;
$exposedPorts[$portWithProtocol] = null; $exposedPorts[$portWithProtocol] = null;
} }
} else {
$requestBody['HostConfig']['NetworkMode'] = 'host';
} }
if(count($exposedPorts) > 0) { if(count($exposedPorts) > 0) {
@ -621,31 +623,31 @@ class DockerActionManager
private function ConnectContainerIdToNetwork(string $id, string $internalPort) : void private function ConnectContainerIdToNetwork(string $id, string $internalPort) : void
{ {
if ($internalPort === 'host') { if ($internalPort === 'host') {
$network = 'host'; return;
} else { }
$network = 'nextcloud-aio';
$url = $this->BuildApiUrl('networks/create'); $network = 'nextcloud-aio';
try { $url = $this->BuildApiUrl('networks/create');
$this->guzzleClient->request( try {
'POST', $this->guzzleClient->request(
$url, 'POST',
[ $url,
'json' => [ [
'Name' => 'nextcloud-aio', 'json' => [
'CheckDuplicate' => true, 'Name' => 'nextcloud-aio',
'Driver' => 'bridge', 'CheckDuplicate' => true,
'Internal' => false, 'Driver' => 'bridge',
'Options' => [ 'Internal' => false,
'com.docker.network.bridge.enable_icc' => 'true' 'Options' => [
] 'com.docker.network.bridge.enable_icc' => 'true'
] ]
] ]
); ]
} catch (RequestException $e) { );
// 409 is undocumented and gets thrown if the network already exists. } catch (RequestException $e) {
if ($e->getCode() !== 409) { // 409 is undocumented and gets thrown if the network already exists.
throw $e; if ($e->getCode() !== 409) {
} throw $e;
} }
} }