diff options
| author |   khilman <khilman@users.noreply.github.com> | 2018-05-25 08:22:05 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-05-25 08:22:05 -0700 |
| commit | 2d79d03f5818c096535c9784b12df5ea99c0dbff (patch) | |
| tree | 74a361f40db3149eeecc6e468933c9ca968358ca /lava-slave | |
| parent | b71a8c43342631b540ac2a3b05962f640f2f0fd7 (diff) | |
| parent | 287e03c09e34ec77d696fcd7ad55912cc127a859 (diff) | |
Merge pull request #25 from montjoie/miscfix03
Miscfix03
Diffstat (limited to 'lava-slave')
| -rw-r--r-- | lava-slave/Dockerfile | 11 | ||||
| -rwxr-xr-x | lava-slave/scripts/start.sh | 14 |
2 files changed, 15 insertions, 10 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 6f2181e..b5e6385 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -2,10 +2,6 @@ FROM bitnami/minideb:stretch RUN apt-get update -# Add services helper utilities to start and stop LAVA -COPY scripts/stop.sh . -COPY scripts/start.sh . - # e2fsprogs is for libguestfs RUN \ echo 'lava-server lava-server/instance-name string lava-slave-instance' | debconf-set-selections && \ @@ -24,10 +20,11 @@ RUN \ qemu-system \ qemu-system-arm \ qemu-system-i386 \ - qemu-kvm \ xnbd-server \ e2fsprogs +RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y install qemu-kvm ; fi + # Uncomment the following for having the latest package (you need to comment all build-lava below) #RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget gnupg \ # && wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \ @@ -56,6 +53,10 @@ RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu RUN rm /etc/apt/sources.list.d/testing.list +# Add services helper utilities to start and stop LAVA +COPY scripts/stop.sh . +COPY scripts/start.sh . + EXPOSE 69/udp 80 CMD /start.sh diff --git a/lava-slave/scripts/start.sh b/lava-slave/scripts/start.sh index dcbbcd7..92e76bb 100755 --- a/lava-slave/scripts/start.sh +++ b/lava-slave/scripts/start.sh @@ -6,18 +6,22 @@ fi service tftpd-hpa start || exit 4 -# FIXME lava-slave does not run if old pid is present -rm -f /var/run/lava-slave.pid -service lava-slave start || exit 5 - touch /var/run/conmux-registry /usr/sbin/conmux-registry 63000 /var/run/conmux-registry& sleep 2 for item in $(ls /etc/conmux/*cf) do echo "Add $item" + # On some OS, the rights/user from host are not duplicated on guest + grep -o '/dev/[a-zA-Z0-9_-]*' $item | xargs chown uucp /usr/sbin/conmux $item & done # start an http file server for boot/transfer_overlay support -(cd /var/lib/lava/dispatcher; python -m SimpleHTTPServer 80) +(cd /var/lib/lava/dispatcher; python -m SimpleHTTPServer 80) & + +# FIXME lava-slave does not run if old pid is present +rm -f /var/run/lava-slave.pid +service lava-slave start || exit 5 + +sleep 3650d |