diff options
| author | Devaev Maxim <[email protected]> | 2018-11-14 20:34:46 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-11-14 20:34:46 +0300 |
| commit | b690dbce4447665db5b4ce0b11f14dc796ca917b (patch) | |
| tree | 62d4961002e09fa79886cdd076283c1c45f8bdd0 /Makefile | |
| parent | e97975fc15d3688a121cfdf18126a16c957838bd (diff) | |
common logging.yaml
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -5,12 +5,15 @@ TESTENV_LOOP ?= /dev/loop7 TESTENV_CMD ?= /bin/bash -c " \ (socat PTY,link=$(TESTENV_HID) PTY,link=/dev/ttyS11 &) \ && rm -rf /etc/nginx/* \ - && cp -r /configs/nginx/* /etc/nginx \ + && cp -r /usr/share/kvmd/configs/nginx/* /etc/nginx \ + && mkdir -p /etc/kvmd \ + && cp /usr/share/kvmd/configs/kvmd/logging.yaml /etc/kvmd/logging.yaml \ + && cp /testenv/kvmd.yaml /etc/kvmd \ && 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 \ - && python -m kvmd.apps.kvmd -c testenv/kvmd.yaml \ + && python -m kvmd.apps.kvmd -c /etc/kvmd/kvmd.yaml \ " @@ -29,8 +32,8 @@ run: - 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`/testenv:/testenv:ro \ - --volume `pwd`/configs:/configs:ro \ --device $(TESTENV_LOOP):/dev/kvmd-msd \ --device $(TESTENV_VIDEO):$(TESTENV_VIDEO) \ --publish 8080:80/tcp \ |