(mesos) branch master updated: CHANGE: add default network if no net options was set.

[bmahler]

This is an automated email from the ASF dual-hosted git repository.

bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new b6750fe61 CHANGE: add default network if no net options was set.
b6750fe61 is described below

commit b6750fe619f3b573e7e00a361117091da0fbc6de
Author: Andreas Peters <a...@aventer.biz>
AuthorDate: Mon May 27 22:33:32 2024 +0200

    CHANGE: add default network if no net options was set.
---
 src/docker/docker.cpp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp
index 8ad58339b..c2a92099a 100644
--- a/src/docker/docker.cpp
+++ b/src/docker/docker.cpp
@@ -947,18 +947,26 @@ Try<Docker::RunOptions> Docker::RunOptions::create(
   options.name = name;
 
   bool dnsSpecified = false;
+  bool networkSpecified = false;
   foreach (const Parameter& parameter, dockerInfo.parameters()) {
-    options.additionalOptions.push_back(
-        "--" + parameter.key() + "=" + parameter.value());
-
-    // In Docker 1.13.0, `--dns-option` was added and `--dns-opt` was hidden
-    // (but it can still be used), so here we need to check both of them.
-    if (!dnsSpecified &&
-        (parameter.key() == "dns" ||
-         parameter.key() == "dns-search" ||
-         parameter.key() == "dns-opt" ||
-         parameter.key() == "dns-option")) {
-      dnsSpecified = true;
+    if (!networkSpecified && 
+        (parameter.key() == "net" || 
+         parameter.key() == "network")) {
+      options.network = parameter.value();
+      networkSpecified = true;
+    } else {
+      options.additionalOptions.push_back(
+          "--" + parameter.key() + "=" + parameter.value());
+  
+      // In Docker 1.13.0, `--dns-option` was added and `--dns-opt` was hidden
+      // (but it can still be used), so here we need to check both of them.
+      if (!dnsSpecified &&
+          (parameter.key() == "dns" ||
+           parameter.key() == "dns-search" ||
+           parameter.key() == "dns-opt" ||
+           parameter.key() == "dns-option")) {
+        dnsSpecified = true;
+      }
     }
   }