From 0f1ebc479cf596f738a018703001880c5fca47a1 Mon Sep 17 00:00:00 2001
From: Jesse Simpson <jesse.simpson@camunda.com>
Date: Wed, 2 Jul 2025 20:30:55 -0400
Subject: [PATCH] feat: add support for external docker networks

When having other docker compose files that submit jobs to the lava
server within this docker compose file, it's useful to be able to set
the external docker network.

This change introduces a new option that allows you to specify
external_docker_networks in a list and for each network name you add to
your config file, your services will be connected to that docker
network.
---
 lavalab-gen.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lavalab-gen.py b/lavalab-gen.py
index bca7504..8995d48 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -113,6 +113,7 @@ def main():
         keywords_master = [
             "allowed_hosts",
             "build_args",
+            "docker_external_networks",
             "event_notifications",
             "groups", "gunicorn_workers",
             "healthcheck_url", "host", "http_fqdn",
@@ -174,6 +175,14 @@ def main():
             dockcomp["volumes"][etc_volume_name] = {}
             dockcomp["volumes"][pg_volume_name] = {}
             dockcomp["volumes"]["lava_job_output"] = {}
+        external_networks = []
+        if "docker_external_networks" in master:
+            external_networks = master["docker_external_networks"]
+            dockcomp["services"][name]["networks"] = external_networks
+        if len(external_networks) > 0:
+            dockcomp["networks"] = {}
+            for external_network in external_networks:
+                dockcomp["networks"][external_network] = { "external": True }
 
         shutil.copytree("lava-master", workerdir)
         os.mkdir("%s/devices" % workerdir)
@@ -430,7 +439,7 @@ def main():
             "arch",
             "bind_dev", "build_args",
             "custom_volumes",
-            "devices", "dispatcher_ip", "default_slave",
+            "devices", "dispatcher_ip", "default_slave", "docker_external_networks",
             "extra_actions", "extra_hosts", "export_ser2net", "expose_ser2net", "expose_ports", "env",
             "host", "host_healthcheck",
             "joblimit", 
@@ -644,11 +653,15 @@ def main():
             else:
                 dockcomp["services"][name]["ports"].append("69:69/udp")
         use_docker = False
+        external_networks = []
         if "use_docker" in worker:
             use_docker = worker["use_docker"]
         if use_docker:
             dockcomp["services"][worker_name]["volumes"].append("/var/run/docker.sock:/var/run/docker.sock")
             dockcomp["services"][worker_name]["volumes"].append("/run/udev/data:/run/udev/data")
+        if "docker_external_networks" in worker:
+            external_networks = worker["docker_external_networks"]
+            dockcomp["services"][worker_name]["networks"] = external_networks
         # TODO permit to change the range of NBD ports
         use_nbd = True
         if "use_nbd" in worker: