diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2018-05-21 11:18:01 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2018-06-05 15:36:31 +0200 |
| commit | 3588f8dc3fb68b3cc21178f3722e980dd9369d2a (patch) | |
| tree | ac9a2eccf7c03f15e913e95b379ae1f86e1022e6 /lava-master/Dockerfile | |
| parent | 31555bcb6555d080e7072fba2fc8ccda0fd59eaa (diff) | |
Upgrade to 2018.4
This patch upgrade lava-docker to LAVA 2018.4
Diffstat (limited to 'lava-master/Dockerfile')
| -rw-r--r-- | lava-master/Dockerfile | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index b475c8c..581999a 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -1,5 +1,7 @@ FROM bitnami/minideb:stretch +RUN echo "deb http://ftp.fr.debian.org/debian/ stretch-backports main" >> /etc/apt/sources.list + RUN apt-get update # Add services helper utilities to start and stop LAVA @@ -46,10 +48,10 @@ RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y in # Install latest COPY scripts/build-lava / -RUN bash /build-lava lava-dispatcher 2017.11 2017.11.post1-1 -RUN service postgresql start && \ - bash /build-lava lava-server 2017.11 2017.11.post1-1 && \ - /stop.sh +RUN bash /build-lava lava-dispatcher 2018.4 2018.4-1 +RUN /etc/init.d/postgresql start && \ + bash /build-lava lava-server 2018.4 2018.4-1 && \ + /etc/init.d/postgresql stop RUN a2enmod proxy \ && a2enmod proxy_http \ @@ -62,6 +64,18 @@ RUN git clone https://github.com/BayLibre/lava-healthchecks.git RUN cp lava-healthchecks/health-checks/* /etc/lava-server/dispatcher-config/health-checks/ COPY health-checks/* /etc/lava-server/dispatcher-config/health-checks/ +# Add services helper utilities to start and stop LAVA +COPY scripts/stop.sh . +COPY scripts/start.sh . +COPY scripts/lava-logs /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-logs +COPY scripts/lava-master /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-master +COPY scripts/lava-slave /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-slave +COPY scripts/lava-server-gunicorn /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-server-gunicorn + COPY devices/ /root/devices/ COPY device-types/ /root/device-types/ COPY users/ /root/lava-users/ |