diff options
| author |   khilman <khilman@users.noreply.github.com> | 2018-09-28 11:34:35 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-09-28 11:34:35 +0200 |
| commit | 5fb5f84d38a074706928b329b99cc01146b915dd (patch) | |
| tree | 73650a91a6ffcc71bd253355d457c3e9fbf19d41 | |
| parent | 869ae36fae80df03e5ed55a26a6f251488a05db4 (diff) | |
| parent | 50e566d7023058f62f356dfddc809fbf5856435e (diff) | |
Merge pull request #49 from montjoie/documentation_deps_csrf
README: enhance documentation on dependencies and CSRF issues
| -rw-r--r-- | README.md | 11 | ||||
| -rw-r--r-- | lava-master/Dockerfile | 1 | ||||
| -rw-r--r-- | requirements.txt | 3 |
3 files changed, 13 insertions, 2 deletions
@@ -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) @@ -361,3 +362,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. 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 |