diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2020-03-18 10:49:28 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-03-18 10:49:28 -0700 |
| commit | 8510b8144b8ca5a17ce956ee447fed4cd1c95e7b (patch) | |
| tree | a239820fdd152dcb00d08fc791cd74f953601e05 /lava-slave | |
| parent | b473faae865f62f50c8c8059e6ebee907d7c6aa6 (diff) | |
| parent | f0fd7f0a9451413e96fe2a48ee6fada5a0f60585 (diff) | |
Merge pull request #115 from montjoie/noentrypoint
lava-slave: handle the case where there are no entrypoints to copy
Diffstat (limited to 'lava-slave')
| -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 |