From 571dbfc1b066f253fcfedd45b6b63d2fac6add3b Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 17 Sep 2018 14:54:36 +0200 Subject: README: enhance documentation on dependencies and CSRF issues This patch add the missing pyyaml requirement in the documentation, fixing issue #31 in the process. Note that this patch adds also a requirements.txt for easy pip install. This patch also a note on http_fqdn stating this option as necessary when using https. --- README.md | 3 ++- lava-master/Dockerfile | 1 - requirements.txt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 requirements.txt 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 -- cgit 1.2.3-korg From 50e566d7023058f62f356dfddc809fbf5856435e Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 26 Sep 2018 13:29:18 +0200 Subject: README: document non-x86 build This patch add documentation on how to use lava-docker on arm64. --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index a45b37f..e67ee7b 100644 --- a/README.md +++ b/README.md @@ -359,3 +359,11 @@ Note that this container provides defaults which are unsecure. If you plan on de * Changing the default admin password (in tokens.taml) * Using HTTPS * Re-enable CSRF cookie (disabled in lava-master/Dockerfile) + +## Non amd64 build +Since LAVA upstream provides only amd64 and arm64 debian packages, lava-docker support only thoses architectures. +For building an arm64 lava-docker, some little trick are necesssary: +- replace "baylibre/lava-xxxx-base" by "baylibre/lava-xxxx-base-arm64" for lava-master and lava-slave dockerfiles + +For building lava-xxx-base images +- replace "bitnami/minideb" by "arm64v8/debian" on lava-master-base/lava-slave-base dockerfiles. -- cgit 1.2.3-korg