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

common config for prod and testing

Browse Source
This commit is contained in:
Devaev Maxim
2018-08-09 05:21:12 +03:00
parent 6f9f745588
commit 260d110b0a
4 changed files with 17 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kvmd/Makefile
View File

@@ -4,7 +4,8 @@ TESTENV_VIDEO ?= /dev/video0
TESTENV_LOOP ?= /dev/loop7
TESTENV_CMD ?= /bin/bash -c " \
(socat PTY,link=$(TESTENV_HID) PTY,link=/dev/ttyS11 &) \
&& nginx -c /testenv/nginx.conf \
&& cp /configs/nginx/nginx.conf.example /etc/nginx/nginx.conf \
&& nginx -c /etc/nginx/nginx.conf \
&& ln -s $(TESTENV_VIDEO) /dev/kvmd-streamer \
&& (losetup -d /dev/kvmd-msd || true) \
&& losetup /dev/kvmd-msd /root/loop.img \
@@ -21,11 +22,12 @@ run:
docker build --rm --tag $(TESTENV_IMAGE) -f testenv/Dockerfile .
- docker run --rm \
--volume `pwd`/kvmd:/kvmd:ro \
--volume `pwd`/web:/web:ro \
--volume `pwd`/web:/usr/share/kvmd/web:ro \
--volume `pwd`/testenv:/testenv:ro \
--volume `pwd`/configs:/configs:ro \
--device $(TESTENV_LOOP):/dev/kvmd-msd \
--device $(TESTENV_VIDEO):$(TESTENV_VIDEO) \
--publish 8080:8080/tcp \
--publish 8080:80/tcp \
--publish 8081:8081/tcp \
--publish 8082:8082/tcp \
-it $(TESTENV_IMAGE) $(TESTENV_CMD)