diff options
author | Devaev Maxim <[email protected]> | 2019-05-10 14:36:28 +0300 |
---|---|---|
committer | Devaev Maxim <[email protected]> | 2019-05-10 14:36:28 +0300 |
commit | 18fa69b77973b5db970797edc1f627e67904606e (patch) | |
tree | a117ca5329ec841e47dab0771a818b49c3ff8f06 /Makefile | |
parent | 03c3caa35eeef059c950874fb291d6ee78d55568 (diff) |
improved users/groups
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -50,7 +50,7 @@ tox: testenv run: testenv sudo modprobe loop - docker run --rm --name kvmd \ - --volume `pwd`/testenv/run:/run:rw \ + --volume `pwd`/testenv/run:/run/kvmd:rw \ --volume `pwd`/testenv:/testenv:ro \ --volume `pwd`/kvmd:/kvmd:ro \ --volume `pwd`/web:/usr/share/kvmd/web:ro \ @@ -65,7 +65,7 @@ run: testenv && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /testenv/main.yaml /etc/kvmd \ - && nginx -c /etc/kvmd/nginx/nginx.conf \ + && nginx -c /etc/kvmd/nginx/nginx.conf -g 'user http; error_log stderr;' \ && ln -s $(TESTENV_VIDEO) /dev/kvmd-video \ && (losetup -d /dev/kvmd-msd || true) \ && losetup /dev/kvmd-msd /root/loop.img \ @@ -76,7 +76,7 @@ run: testenv run-ipmi: testenv - docker run --rm --name kvmd-ipmi \ - --volume `pwd`/testenv/run:/run:rw \ + --volume `pwd`/testenv/run:/run/kvmd:rw \ --volume `pwd`/testenv:/testenv:ro \ --volume `pwd`/kvmd:/kvmd:ro \ --volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \ |