From e6ca8cd167e51675d58fef1710dae12194387dd6 Mon Sep 17 00:00:00 2001
From: Matt <Geczy@users.noreply.github.com>
Date: Sun, 11 Feb 2024 09:22:09 -0600
Subject: [PATCH] fix: only add 'networks' key if 'network_mode' is absent

---
 bootstrap/helpers/shared.php | 40 ++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 7ffc6a72c..793ee8be6 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -527,28 +527,32 @@ function getTopLevelNetworks(Service|Application $resource)
             $definedNetwork = collect([$resource->uuid]);
             $services = collect($services)->map(function ($service, $_) use ($topLevelNetworks, $definedNetwork) {
                 $serviceNetworks = collect(data_get($service, 'networks', []));
+                $hasNetworkMode = data_get($service, 'network_mode');
 
-                // Collect/create/update networks
-                if ($serviceNetworks->count() > 0) {
-                    foreach ($serviceNetworks as $networkName => $networkDetails) {
-                        $networkExists = $topLevelNetworks->contains(function ($value, $key) use ($networkName) {
-                            return $value == $networkName || $key == $networkName;
-                        });
-                        if (!$networkExists) {
-                            $topLevelNetworks->put($networkDetails, null);
+                 // Only add 'networks' key if 'network_mode' is absent
+                if (!$hasNetworkMode) {
+                    // Collect/create/update networks
+                    if ($serviceNetworks->count() > 0) {
+                        foreach ($serviceNetworks as $networkName => $networkDetails) {
+                            $networkExists = $topLevelNetworks->contains(function ($value, $key) use ($networkName) {
+                                return $value == $networkName || $key == $networkName;
+                            });
+                            if (!$networkExists) {
+                                $topLevelNetworks->put($networkDetails, null);
+                            }
                         }
                     }
-                }
 
-                $definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) {
-                    return $value == $definedNetwork;
-                });
-                if (!$definedNetworkExists) {
-                    foreach ($definedNetwork as $network) {
-                        $topLevelNetworks->put($network,  [
-                            'name' => $network,
-                            'external' => true
-                        ]);
+                    $definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) {
+                        return $value == $definedNetwork;
+                    });
+                    if (!$definedNetworkExists) {
+                        foreach ($definedNetwork as $network) {
+                            $topLevelNetworks->put($network,  [
+                                'name' => $network,
+                                'external' => true
+                            ]);
+                        }
                     }
                 }