feat(#683): Return the gateway address of a network if one is assigned

testcontainers · Nov 25, 2022 · 2d04584 · 2d04584
1 parent 45a8935
commit 2d04584
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 - 642 Expose container port bindings automatically
 - 603 Add default logger that forwards messages to the console (does not support every test environment)
+- 683 Return the gateway address (`IDockerContainer.Hostname`) of a network if one is assigned
 
 ### Fixed
 

diff --git a/src/Testcontainers/Containers/TestcontainersContainer.cs b/src/Testcontainers/Containers/TestcontainersContainer.cs
@@ -388,19 +388,8 @@ private string GetContainerGateway()
         return localhost;
       }
 
-      var endpointSettings = this.container.NetworkSettings.Networks.TryGetValue("bridge", out var network) ? network : new EndpointSettings();
-      if (!string.IsNullOrWhiteSpace(endpointSettings.Gateway))
-      {
-        return endpointSettings.Gateway;
-      }
-
-      var networkSettings = this.container.NetworkSettings;
-      if (!string.IsNullOrWhiteSpace(networkSettings.Gateway))
-      {
-        return networkSettings.Gateway;
-      }
-
-      return localhost;
+      var endpointSettings = this.container.NetworkSettings.Networks.Values.FirstOrDefault();
+      return endpointSettings == null ? localhost : endpointSettings.Gateway;
     }
   }
 }