diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2020-03-13 16:39:43 +0100 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2020-03-18 15:51:24 +0100 |
| commit | f0fd7f0a9451413e96fe2a48ee6fada5a0f60585 (patch) | |
| tree | a239820fdd152dcb00d08fc791cd74f953601e05 | |
| parent | b473faae865f62f50c8c8059e6ebee907d7c6aa6 (diff) | |
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.
| -rw-r--r-- | lava-slave/Dockerfile | 2 | ||||
| -rw-r--r-- | lava-slave/entrypoint.d/empty (renamed from lava-slave/entrypoint.d/.empty) | 0 |
2 files changed, 1 insertions, 1 deletions
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 index e69de29..e69de29 100644 --- a/lava-slave/entrypoint.d/.empty +++ b/lava-slave/entrypoint.d/empty |