diff options
| author | Devaev Maxim <[email protected]> | 2018-08-09 05:21:12 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-08-09 05:21:12 +0300 |
| commit | 260d110b0a94de46d6d012ccf71423416faa781b (patch) | |
| tree | 328ee6b6f0fc8cff516850617202948ed0de2ff8 /kvmd/Makefile | |
| parent | 6f9f7455888b4132e5dca6762aee4c395f6b43fa (diff) | |
common config for prod and testing
Diffstat (limited to 'kvmd/Makefile')
| -rw-r--r-- | kvmd/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kvmd/Makefile b/kvmd/Makefile index fa47bdbc..fd98dc4b 100644 --- a/kvmd/Makefile +++ b/kvmd/Makefile @@ -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) |