diff options
| author | Devaev Maxim <[email protected]> | 2018-11-18 08:11:18 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-11-18 08:11:18 +0300 |
| commit | 9762c82d0a6c49f052e2d499a6e54585fde4b0a0 (patch) | |
| tree | b9a5e844e4656f77deefe5faa6c46ab5d6fde312 /testenv | |
| parent | 51dd9a7428fc0249dd605397ccc955a9fd1cd5cd (diff) | |
moved lua crutch to kvmd
Diffstat (limited to 'testenv')
| -rw-r--r-- | testenv/Dockerfile | 5 | ||||
| -rw-r--r-- | testenv/kvmd.yaml | 1 | ||||
| -rw-r--r-- | testenv/requirements.txt | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile index 59106908..78226b17 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -43,8 +43,8 @@ RUN pacman -Syy \ python \ python-pip \ python-systemd \ + python-dbus \ nginx-mainline \ - lua51-cjson \ ustreamer \ socat \ htmlhint \ @@ -56,4 +56,7 @@ RUN pacman -Syy \ COPY testenv/requirements.txt requirements.txt RUN pip install -r requirements.txt +RUN rm -rf /etc/nginx/* \ + && mkdir /etc/kvmd + CMD /bin/bash diff --git a/testenv/kvmd.yaml b/testenv/kvmd.yaml index 9f1f355b..68035bd2 100644 --- a/testenv/kvmd.yaml +++ b/testenv/kvmd.yaml @@ -6,6 +6,7 @@ kvmd: info: meta: /etc/kvmd/meta.yaml + extras: /usr/share/kvmd/extras hid: pinout: diff --git a/testenv/requirements.txt b/testenv/requirements.txt index 63aa4112..4f95d90a 100644 --- a/testenv/requirements.txt +++ b/testenv/requirements.txt @@ -6,4 +6,5 @@ pyyaml pyserial setproctitle systemd-python +dbus-python tox |