summaryrefslogtreecommitdiffstats
path: root/lava-slave/Dockerfile
diff options
context:
space:
mode:
authorkhilman <khilman@users.noreply.github.com>2019-04-07 20:35:55 -0700
committerGitHub <noreply@github.com>2019-04-07 20:35:55 -0700
commit6d2fb57fdaf6bed78b131f7c6b4aed71d55630c7 (patch)
treebd12f4a94330cbd3c75faa952b687b6a10e2bc5a /lava-slave/Dockerfile
parent31d0a888ee944ac0f8c0418dff942adfde448ca7 (diff)
parent14e3c762e575d8742b39799018913e7d944111b6 (diff)
Merge pull request #86 from montjoie/support_2019.03
Support 2019.03
Diffstat (limited to 'lava-slave/Dockerfile')
-rw-r--r--lava-slave/Dockerfile9
1 files changed, 6 insertions, 3 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index 32a76b0..3ff2888 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -1,8 +1,8 @@
-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
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu conmux telnet
COPY configs/lava-slave /etc/lava-dispatcher/lava-slave
@@ -35,7 +35,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,6 +46,7 @@ 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