diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2019-06-25 09:42:25 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2019-06-25 09:48:24 +0200 |
| commit | 2c7d975039c64a4daa6c57cfd7aedfd93286e3bd (patch) | |
| tree | efcce91743b3da21f9fb5dcd0963845de25c73b7 | |
| parent | 6a670632e15a3f40a05e164bf476b7519d9a166f (diff) | |
lava-master: remove tftp/lava-slave
The lava-docker infrastructure have now splitted master and slave.
So there are no reason to keep tftp/lava-slave on master.
| -rw-r--r-- | lava-master/Dockerfile | 4 | ||||
| -rw-r--r-- | lava-master/configs/tftpd-hpa | 6 | ||||
| -rwxr-xr-x | lava-master/scripts/start.sh | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 6051851..7a70b58 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 @@ -36,6 +34,6 @@ COPY lava_http_fqdn /root/ COPY env/ /etc/lava-server/dispatcher.d/ -EXPOSE 69/udp 80 3079 5555 5556 +EXPOSE 3079 5555 5556 CMD /start.sh && while [ true ];do sleep 365d; done diff --git a/lava-master/configs/tftpd-hpa b/lava-master/configs/tftpd-hpa deleted file mode 100644 index bb6f079..0000000 --- a/lava-master/configs/tftpd-hpa +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/default/tftpd-hpa - -TFTP_USERNAME="tftp" -TFTP_DIRECTORY="/var/lib/lava/dispatcher/tmp/" -TFTP_ADDRESS="0.0.0.0:69" -TFTP_OPTIONS="--secure" diff --git a/lava-master/scripts/start.sh b/lava-master/scripts/start.sh index c34fe34..ce94c39 100755 --- a/lava-master/scripts/start.sh +++ b/lava-master/scripts/start.sh @@ -32,9 +32,7 @@ start apache2 || exit $? start lava-logs || exit $? start lava-master || exit $? start lava-coordinator || exit $? -start lava-slave || exit $? start lava-server-gunicorn || exit $? -start tftpd-hpa || exit $? postgres-ready service apache2 reload #added after the website not running a few times on boot |