process optional use_host_network flag

theCapypara · Jul 27, 2022 · 94e3299 · 94e3299
1 parent 38b83ae
commit 94e3299
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/riptide_engine_docker/cmd_detached.py b/riptide_engine_docker/cmd_detached.py
@@ -31,6 +31,7 @@ def cmd_detached(client: DockerClient, project: 'Project', command: 'Command', r
     )
 
     builder.set_name(get_container_name(project["name"]))
+    # network_mode host not supported atm
     builder.set_network(get_network_name(project["name"]))
 
     builder.set_env(EENV_NO_STDOUT_REDIRECT, "yes")

diff --git a/riptide_engine_docker/container_builder.py b/riptide_engine_docker/container_builder.py
@@ -65,6 +65,7 @@ def __init__(self, image: str, command: Union[List, str, None]) -> None:
         self.hostname = None
         self.allow_full_memlock = False
         self.cap_sys_admin = False
+        self.use_host_network = False
 
         self.on_linux = platform.system().lower().startswith('linux')
         self.set_env(EENV_ON_LINUX, "1" if self.on_linux else "0")
@@ -114,6 +115,10 @@ def set_network(self, network: str):
         self.network = network
         return self
 
+    def set_use_host_network(self, flag: bool):
+        self.use_host_network = flag
+        return self
+
     def set_name(self, name: str):
         self.name = name
         return self
@@ -282,8 +287,14 @@ def build_docker_api(self) -> dict:
 
         if self.name:
             args['name'] = self.name
-        if self.network:
-            args['network'] = self.network
+
+        if self.use_host_network:
+            args['network_mode'] = 'host'
+        else:
+            if self.network:
+                args['network'] = self.network
+            args['ports'] = self.ports
+
         if self.entrypoint:
             args['entrypoint'] = [self.entrypoint]
         if self.work_dir:
@@ -307,7 +318,7 @@ def build_docker_api(self) -> dict:
             args['environment'][EENV_NAMED_VOLUMES] = ':'.join(self.named_volumes_in_cnt)
 
         args['labels'] = self.labels
-        args['ports'] = self.ports
+
         args['mounts'] = list(self.mounts.values())
 
         return args
@@ -321,8 +332,15 @@ def build_docker_cli(self) -> List[str]:
         ]
         if self.name:
             shell += ["--name", self.name]
-        if self.network:
-            shell += ["--network", self.network]
+
+        if self.use_host_network:
+            shell += ["--network", 'host']
+        else:
+            if self.network:
+                shell += ["--network", self.network]
+            for container, host in self.ports.items():
+                shell += ['-p', str(host) + ':' + str(container)]
+
         if self.entrypoint:
             shell += ["--entrypoint", self.entrypoint]
         if self.work_dir:
@@ -342,9 +360,6 @@ def build_docker_cli(self) -> List[str]:
         for key, value in self.labels.items():
             shell += ['--label', key + '=' + value]
 
-        for container, host in self.ports.items():
-            shell += ['-p', str(host) + ':' + str(container)]
-
         # Mac: Add delegated
         mac_add = ',consistency=delegated' if platform.system().lower().startswith('mac') else ''
         for mount in self.mounts.values():

diff --git a/riptide_engine_docker/fg.py b/riptide_engine_docker/fg.py
@@ -135,6 +135,9 @@ def fg(client, project: Project, container_name: str, exec_object: Union[Command
     builder.set_name(container_name)
     builder.set_network(get_network_name(project["name"]))
 
+    if "use_host_network" in exec_object and exec_object["use_host_network"]:
+        builder.set_use_host_network(True)
+
     builder.set_env(EENV_NO_STDOUT_REDIRECT, "yes")
     builder.set_args(arguments)