diff options
| author |   khilman <khilman@users.noreply.github.com> | 2018-01-24 08:58:57 -0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-01-24 08:58:57 -0800 |
| commit | f14d69b382978069321acdec9a434ca85ac137da (patch) | |
| tree | 90cdd4df15614ffe022778f986d551a63959712e /docker-compose.template | |
| parent | 736fc3248108069d9f7d98fadc436aad3732dfab (diff) | |
| parent | c856c35e30f4465f8d14834d672a0dcbf06567fb (diff) | |
Merge pull request #13 from montjoie/bugfix
Bugfix
Diffstat (limited to 'docker-compose.template')
| -rw-r--r-- | docker-compose.template | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/docker-compose.template b/docker-compose.template index d7986ec..d125af8 100644 --- a/docker-compose.template +++ b/docker-compose.template @@ -7,19 +7,21 @@ services: tty: true build: context: lava-master - devices: - - "/dev/kvm:/dev/kvm" +# TODO handle kvm option +# devices: +# - "/dev/kvm:/dev/kvm" ports: - "10080:80" - - "1022:22" - "5555:5555" - "5556:5556" volumes: -# boot and /lib/modules are for libguestfs +# boot and /lib/modules are for libguestfs (TODO set them read_only with docker-compose 3.0) - "/boot:/boot" - "/lib/modules:/lib/modules" lava-slave: hostname: lab-slave-0 +#conmux does not support dns_search + dns_search: "" restart: always build: context: lava-slave @@ -29,7 +31,11 @@ services: ports: - "69:69/udp" - "80:80" - - "55980-56000:55980-56000" + - "61950-62000:61950-62000" + volumes: +# boot and /lib/modules are for libguestfs (TODO set them read_only with docker-compose 3.0) + - "/boot:/boot" + - "/lib/modules:/lib/modules" links: - "lava-master" squid: |