aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md3
-rw-r--r--lava-master/Dockerfile1
-rw-r--r--requirements.txt3
3 files changed, 5 insertions, 2 deletions
diff --git a/README.md b/README.md
index 16db7b8..a45b37f 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ lava-docker has currently been tested primarily on Debian stable (stretch).
The following packages are necessary on the host machine:
* docker
* docker-compose
+* pyyaml
## Quickstart
Example to use lava-docker with only one QEMU device:
@@ -219,7 +220,7 @@ masters:
zmq_auth_key: optional path to a public ZMQ key
zmq_auth_key_secret: optional path to a private ZMQ key
persistent_db: True/False (default False) Is the postgres DB is persistent over reboot
- http_fqdn: The FQDN used to access the LAVA web interface
+ http_fqdn: The FQDN used to access the LAVA web interface. This is necessary if you use https otherwise you will issue CSRF errors.
users:
- name: LAVA username
token: The token of this user (optional)
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 1270e32..d824135 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -18,7 +18,6 @@ COPY scripts/setup.sh /
# warning the address used must be network accessible by all slave
#RUN sed -i 's,^.*http_proxy:.*, http_proxy: http://squid:3128,' /etc/lava-server/env.yaml
-#comment this if you do HTTPS (For reenabling CSRF cookie)
COPY settings.conf /etc/lava-server/
COPY device-types-patch/ /root/device-types-patch/
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..71b6c16
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+docker
+docker-compose
+pyyaml