From f0fd7f0a9451413e96fe2a48ee6fada5a0f60585 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Fri, 13 Mar 2020 16:39:43 +0100 Subject: lava-slave: handle the case where there are no entrypoints to copy If there are no entrypoint to copy, the COPY docker action will fail. For fixing this issue, simply copy all files instead of just "*sh". Since the entrypoint.d directory is not empty (got an empty file) it will always works. The LAVA script run only *sh files so we are still safe. --- lava-slave/Dockerfile | 2 +- lava-slave/entrypoint.d/.empty | 0 lava-slave/entrypoint.d/empty | 0 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 lava-slave/entrypoint.d/.empty create mode 100644 lava-slave/entrypoint.d/empty (limited to 'lava-slave') diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index bf908f9..007b786 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -63,7 +63,7 @@ COPY devices/ /root/devices/ COPY tags/ /root/tags/ COPY aliases/ /root/aliases/ COPY deviceinfo/ /root/deviceinfo/ -COPY entrypoint.d/*sh /root/entrypoint.d/ +COPY entrypoint.d/* /root/entrypoint.d/ RUN chmod +x /root/entrypoint.d/* RUN if [ -x /usr/local/bin/extra_actions ] ; then /usr/local/bin/extra_actions ; fi diff --git a/lava-slave/entrypoint.d/.empty b/lava-slave/entrypoint.d/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/lava-slave/entrypoint.d/empty b/lava-slave/entrypoint.d/empty new file mode 100644 index 0000000..e69de29 -- cgit 1.2.3-korg