diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2019-06-27 16:26:04 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-06-27 16:26:04 -0700 |
| commit | c0be09b6ddfd855eeadb3628a481f9c0bb4e26b7 (patch) | |
| tree | bbe706a7ad9df904529415efb2052bd2e1396f14 /lava-master/Dockerfile | |
| parent | b9e4d31719373b52c7113d0e8a960332fd8ef8c6 (diff) | |
| parent | d791251fbc4a739f4479a358544d434540c0b02a (diff) | |
Merge pull request #95 from montjoie/pre-2019.05
Pre 2019.05
Diffstat (limited to 'lava-master/Dockerfile')
| -rw-r--r-- | lava-master/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index b018a2d..80da8fb 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -2,8 +2,6 @@ FROM baylibre/lava-master-base:2019.03_stretch COPY backup /root/backup/ -COPY configs/tftpd-hpa /etc/default/tftpd-hpa - COPY default/* /etc/default/ RUN git clone https://github.com/BayLibre/lava-healthchecks.git @@ -18,6 +16,7 @@ COPY users/ /root/lava-users/ COPY groups/ /root/lava-groups/ COPY tokens/ /root/lava-callback-tokens/ COPY scripts/setup.sh / +COPY scripts/start.sh / COPY settings.conf /etc/lava-server/ @@ -35,6 +34,8 @@ COPY lava_http_fqdn /root/ COPY env/ /etc/lava-server/dispatcher.d/ -EXPOSE 69/udp 80 3079 5555 5556 +COPY apache2/ /etc/apache2/ + +EXPOSE 3079 5555 5556 CMD /start.sh && while [ true ];do sleep 365d; done |