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 /Makefile | |
| parent | 51dd9a7428fc0249dd605397ccc955a9fd1cd5cd (diff) | |
moved lua crutch to kvmd
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -4,10 +4,8 @@ TESTENV_VIDEO ?= /dev/video0 TESTENV_LOOP ?= /dev/loop7 TESTENV_CMD ?= /bin/bash -c " \ (socat PTY,link=$(TESTENV_HID) PTY,link=/dev/ttyS11 &) \ - && rm -rf /etc/nginx/* \ - && cp -r /usr/share/kvmd/configs/nginx/* /etc/nginx \ - && mkdir -p /etc/kvmd \ - && cp /usr/share/kvmd/configs/kvmd/*.yaml /etc/kvmd \ + && cp -r /usr/share/kvmd/configs.default/nginx/* /etc/nginx \ + && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /testenv/kvmd.yaml /etc/kvmd \ && nginx -c /etc/nginx/nginx.conf \ && ln -s $(TESTENV_VIDEO) /dev/kvmd-streamer \ @@ -33,7 +31,8 @@ run: _testenv - docker run --rm \ --volume `pwd`/kvmd:/kvmd:ro \ --volume `pwd`/web:/usr/share/kvmd/web:ro \ - --volume `pwd`/configs:/usr/share/kvmd/configs:ro \ + --volume `pwd`/extras:/usr/share/kvmd/extras:ro \ + --volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \ --volume `pwd`/testenv:/testenv:ro \ --device $(TESTENV_LOOP):/dev/kvmd-msd \ --device $(TESTENV_VIDEO):$(TESTENV_VIDEO) \ |