diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2020-06-01 13:37:45 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2020-06-01 13:37:45 +0200 |
| commit | e3f6e56904164003d00833b26a3d6486afcd55e1 (patch) | |
| tree | e75b3fe71f43c243cd597494a27cb85327154cc4 | |
| parent | 85f3c0d8274ef32865d00bf670277dcc69563f43 (diff) | |
Support docker
docker need some more bind mounts.
| -rwxr-xr-x | lavalab-gen.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lavalab-gen.py b/lavalab-gen.py index 96d25c1..a0cb89d 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -564,6 +564,7 @@ def main(): 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") # TODO permit to change the range of NBD ports use_nbd = True if "use_nbd" in worker: @@ -582,8 +583,9 @@ def main(): use_nfs = False if "use_nfs" in worker: use_nfs = worker["use_nfs"] - if use_nfs: + if use_nfs or use_docker: dockcomp["services"][worker_name]["volumes"].append("/var/lib/lava/dispatcher/tmp:/var/lib/lava/dispatcher/tmp") + if use_nfs: fp = open("%s/scripts/extra_actions" % workerdir, "a") # LAVA check if this package is installed when doing NFS jobs # So we need to install it, even if it is not used |