GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved lua crutch to kvmd

Browse Source
This commit is contained in:
Devaev Maxim
2018-11-18 08:11:18 +03:00
parent 51dd9a7428
commit 9762c82d0a
15 changed files with 98 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -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) \