summaryrefslogtreecommitdiffstats
path: root/lava-slave/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'lava-slave/Dockerfile')
-rw-r--r--lava-slave/Dockerfile19
1 files changed, 16 insertions, 3 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index 32a76b0..d6375f2 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -1,8 +1,11 @@
-FROM baylibre/lava-slave-base:2018.11-1_bpo9_1
+FROM baylibre/lava-slave-base:2019.03_stretch
RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu conmux
+# cu conmux is for console via conmux
+# telnet is for using ser2net
+# git is necessary for checkout tests
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu conmux telnet git
COPY configs/lava-slave /etc/lava-dispatcher/lava-slave
@@ -35,7 +38,9 @@ RUN apt-get update
RUN apt-get -y install lavacli
# PXE stuff
-RUN apt-get -y install grub-efi-amd64-bin
+RUN if [ $(uname -m) != amd64 ]; then dpkg --add-architecture amd64 && apt-get update; fi
+RUN apt-get -y install grub-efi-amd64-bin:amd64
+RUN if [ $(uname -m) != amd64 ]; then dpkg --remove architecture amd64 && apt-get update; fi
RUN cd /var/lib/lava/dispatcher/tmp && grub-mknetdir --net-directory=.
COPY grub.cfg /var/lib/lava/dispatcher/tmp/boot/grub/
@@ -44,9 +49,17 @@ COPY default/* /etc/default/
COPY phyhostname /root/
COPY scripts/setup.sh .
+RUN apt-get -y install patch
COPY lava-patch/ /root/lava-patch
RUN cd /usr/lib/python3/dist-packages && for patch in $(ls /root/lava-patch/*patch) ; do patch -p1 < $patch || exit $?;done
+RUN mkdir /etc/lava-coordinator/
+COPY lava-coordinator/* /etc/lava-coordinator/
+RUN if [ -e /etc/lava-coordinator/lava-coordinator.cnf ]; then DEBIAN_FRONTEND=noninteractive apt-get -y install lava-coordinator && mv /etc/lava-coordinator/lava-coordinator.cnf /etc/lava-coordinator/lava-coordinator.conf ; fi
+
+# needed for lavacli identities
+RUN mkdir -p /root/.config
+
COPY devices/ /root/devices/
COPY tags/ /root/tags/
COPY deviceinfo/ /root/deviceinfo/