From b8f561127a2ba09f3c2e49194d8d63b6960023b2 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 16 Jul 2018 14:26:44 +0200 Subject: Split dockerfile in two images The process of building LAVA is hard to maintain. But since we need to be able to go back in time (or just stay longer with a specific version) we need a way to keep a LAVA version. For achieving this, we build a minimal image with just LAVA and tag it with the version of LAVA inside. --- lava-slave/scripts/start.sh | 46 --------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100755 lava-slave/scripts/start.sh (limited to 'lava-slave/scripts/start.sh') diff --git a/lava-slave/scripts/start.sh b/lava-slave/scripts/start.sh deleted file mode 100755 index 21b6903..0000000 --- a/lava-slave/scripts/start.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -/setup.sh || exit $? - -# Set LAVA Master IP -if [[ -n "$LAVA_MASTER" ]]; then - sed -i -e "s/{LAVA_MASTER}/$LAVA_MASTER/g" /etc/lava-dispatcher/lava-slave -fi - -service tftpd-hpa start || exit 4 -if [ -s /etc/ser2net.conf ];then - service ser2net start || exit 7 -fi - -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 - -HAVE_SCREEN=0 -while read screenboard -do - echo "Start screen for $screenboard" - TERM=xterm screen -d -m -S $screenboard /dev/$screenboard 115200 -ixoff -ixon || exit 9 - HAVE_SCREEN=1 -done < /root/lava-screen.conf -if [ $HAVE_SCREEN -eq 1 ];then - sed -i 's,UsePAM.*yes,UsePAM no,' /etc/ssh/sshd_config || exit 10 - service ssh start || exit 11 -fi - - -# start an http file server for boot/transfer_overlay support -(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 -- cgit 1.2.3-korg