summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Baker <tyler.baker@linaro.org>2017-05-01 10:45:06 -0700
committerTyler Baker <tyler.baker@linaro.org>2017-05-01 10:45:06 -0700
commit2e448945269ca28b644f587bf40afd9fe6c38583 (patch)
tree7205cf78be43d50648a1eb302529549471a58c98
parent47133ea0a35636cbd3601bbcd57f10fff32a6f9e (diff)
Dockerfile: shuffle scripts, and add tftp support
Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
-rw-r--r--Dockerfile7
-rw-r--r--configs/tftpd-hpa6
-rwxr-xr-xscripts/start.sh (renamed from start.sh)0
-rwxr-xr-xscripts/stop.sh (renamed from stop.sh)0
4 files changed, 11 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index b74261f..b5647f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
FROM bitnami/minideb:unstable
# Add services helper utilities to start and stop LAVA
-COPY stop.sh .
-COPY start.sh .
+COPY scripts/stop.sh .
+COPY scripts/start.sh .
# Install debian packages used by the container
# Configure apache to run the lava server
@@ -55,5 +55,8 @@ RUN /start.sh \
&& cd /root/lava-server && /root/lava-server/share/debian-dev-build.sh -p lava-server \
&& /stop.sh
+COPY configs/tftpd-hpa /etc/default/tftpd-hpa
+
EXPOSE 69 80 5555 5556
+
CMD /start.sh && bash
diff --git a/configs/tftpd-hpa b/configs/tftpd-hpa
new file mode 100644
index 0000000..bb6f079
--- /dev/null
+++ b/configs/tftpd-hpa
@@ -0,0 +1,6 @@
+# /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/start.sh b/scripts/start.sh
index 54de1f6..54de1f6 100755
--- a/start.sh
+++ b/scripts/start.sh
diff --git a/stop.sh b/scripts/stop.sh
index 8b5feda..8b5feda 100755
--- a/stop.sh
+++ b/scripts/stop.sh