summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Baker <tyler.baker@linaro.org>2017-04-01 11:42:49 -0700
committerTyler Baker <tyler.baker@linaro.org>2017-04-01 11:44:42 -0700
commit0a941d6954ce5e1aa7169cde452854d8ff054780 (patch)
tree882326f5e4273d1c3f8d83cd981432a0da72a690
parent1d0fbb9fa61236a39c652252741fb786e820a552 (diff)
Add support for the LAVA hosted tftp server
Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
-rw-r--r--Dockerfile2
-rw-r--r--README.md2
-rwxr-xr-xstart.sh1
-rwxr-xr-xstop.sh1
4 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index ee34e06..6df2930 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,5 +58,5 @@ RUN /start.sh \
&& cd /root/lava-server && /root/lava-server/share/debian-dev-build.sh -p lava-server \
&& /stop.sh
-EXPOSE 22 80 5555 5556
+EXPOSE 69 80 5555 5556
CMD /start.sh && bash
diff --git a/README.md b/README.md
index 0174706..3b03712 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,6 @@ sudo docker build -t lava .
To run the image from a host terminal / command line execute the following:
```
-sudo docker run -it -v /dev:/dev -p 80:80 -p 5555:5555 -p 5556:5556 -h <HOSTNAME> --privileged lava
+sudo docker run -it -v /dev:/dev -p 69:69 -p 80:80 -p 5555:5555 -p 5556:5556 -h <HOSTNAME> --privileged lava
```
Where HOSTNAME is the hostname used during the container build process (check the docker build log), as that is the name used for the worker configuration. You can use `lava-docker` as the pre-built container hostname.
diff --git a/start.sh b/start.sh
index 09ae15f..54de1f6 100755
--- a/start.sh
+++ b/start.sh
@@ -30,6 +30,7 @@ start lava-server
start lava-master
start lava-slave
start lava-server-gunicorn
+start tftpd-hpa
postgres-ready
service apache2 reload #added after the website not running a few times on boot
diff --git a/stop.sh b/stop.sh
index 7b23fb0..8b5feda 100755
--- a/stop.sh
+++ b/stop.sh
@@ -6,3 +6,4 @@ service lava-server stop
service lava-server-gunicorn stop
service apache2 stop
service postgresql stop
+service tftpd-hpa stop