summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhilman <khilman@users.noreply.github.com>2018-10-03 16:56:58 +0200
committerGitHub <noreply@github.com>2018-10-03 16:56:58 +0200
commitf74ee88cb72165a8a825fa674a53372df169f4b6 (patch)
treec1c10cc14183beb4c164049a7738a45aa5465cef
parent5fb5f84d38a074706928b329b99cc01146b915dd (diff)
parentf3d53d64922d996612056fa6c4962c5af59e51a5 (diff)
Merge pull request #51 from montjoie/copy_script
lava-slave/Dockerfile: copy all scripts in one actions
-rw-r--r--lava-slave/Dockerfile10
1 files changed, 2 insertions, 8 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index d9ae68a..c029e47 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -6,7 +6,8 @@ COPY configs/lava-slave /etc/lava-dispatcher/lava-slave
COPY configs/tftpd-hpa /etc/default/tftpd-hpa
-COPY scripts/cu-loop /usr/local/bin/
+COPY scripts/ /usr/local/bin/
+RUN chmod a+x /usr/local/bin/*
COPY conmux/ /etc/conmux/
# Caution to not use any port between the Linux dynamic port range: 32768-60999
@@ -36,16 +37,9 @@ RUN git clone https://git.linaro.org/lava/lavacli.git /root/lavacli && cd /root/
COPY phyhostname /root/
COPY scripts/setup.sh .
-COPY scripts/setdispatcherip.py /usr/local/bin/
-RUN chmod 755 /usr/local/bin/setdispatcherip.py
-
-COPY scripts/retire.sh /usr/local/bin/
-RUN chmod 755 /usr/local/bin/retire.sh
-
COPY devices/ /root/devices/
COPY tags/ /root/tags/
-COPY scripts/extra_actions /root/
RUN if [ -x /root/extra_actions ] ; then /root/extra_actions ; fi
RUN apt-get -y install screen openssh-server