diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2019-09-04 09:24:52 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-09-04 09:24:52 -0700 |
| commit | b62cce369977403b2b2fa5e6d7c0af9d71058364 (patch) | |
| tree | 63f92d5c2c23a1842e65154129d74a26838bc0ce /lava-slave/Dockerfile | |
| parent | c0be09b6ddfd855eeadb3628a481f9c0bb4e26b7 (diff) | |
| parent | 57bfd7462de249be794db3d015e7aa8177891863 (diff) | |
Merge pull request #99 from montjoie/2019.07
2019.07
Diffstat (limited to 'lava-slave/Dockerfile')
| -rw-r--r-- | lava-slave/Dockerfile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 5fdae2f..b93e310 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -1,4 +1,4 @@ -FROM baylibre/lava-slave-base:2019.03_stretch +FROM lavasoftware/lava-dispatcher:2019.07 RUN apt-get update @@ -61,6 +61,7 @@ RUN mkdir -p /root/.config COPY devices/ /root/devices/ COPY tags/ /root/tags/ +COPY aliases/ /root/aliases/ COPY deviceinfo/ /root/deviceinfo/ RUN if [ -x /usr/local/bin/extra_actions ] ; then /usr/local/bin/extra_actions ; fi @@ -74,4 +75,4 @@ COPY zmq_auth/ /etc/lava-dispatcher/certificates.d/ EXPOSE 69/udp 80 -CMD /start.sh +CMD /usr/local/bin/start.sh |