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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim 2019-06-28 20:29:16 +03:00
parent ef3c62a7af
commit ae791c363c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -28,7 +28,7 @@ all:
testenv: testenv:
docker build $(if $(NC), --no-cache,) --rm --tag $(TESTENV_IMAGE) -f testenv/Dockerfile . docker build $(if $(NC),--no-cache,) --rm --tag $(TESTENV_IMAGE) -f testenv/Dockerfile .
tox: testenv tox: testenv
@ -43,7 +43,7 @@ tox: testenv
&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
&& cp /src/testenv/main.yaml /etc/kvmd \ && cp /src/testenv/main.yaml /etc/kvmd \
&& cd /src \ && cd /src \
&& tox -c testenv/tox.ini $(if $(E), -e $(E), -p auto) \ && tox -c testenv/tox.ini $(if $(E),-e $(E),-p auto) \
" "
@ -69,7 +69,7 @@ run: testenv
&& ln -s $(TESTENV_VIDEO) /dev/kvmd-video \ && ln -s $(TESTENV_VIDEO) /dev/kvmd-video \
&& (losetup -d /dev/kvmd-msd || true) \ && (losetup -d /dev/kvmd-msd || true) \
&& losetup /dev/kvmd-msd /root/loop.img \ && losetup /dev/kvmd-msd /root/loop.img \
&& $(if $(CMD), $(CMD), python -m kvmd.apps.kvmd) \ && $(if $(CMD),$(CMD),python -m kvmd.apps.kvmd) \
" "
- docker run --rm --device=$(TESTENV_LOOP):/dev/kvmd-msd -it $(TESTENV_IMAGE) losetup -d /dev/kvmd-msd - docker run --rm --device=$(TESTENV_LOOP):/dev/kvmd-msd -it $(TESTENV_IMAGE) losetup -d /dev/kvmd-msd
@ -85,7 +85,7 @@ run-ipmi: testenv
cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
&& cp /testenv/main.yaml /etc/kvmd \ && cp /testenv/main.yaml /etc/kvmd \
&& $(if $(CMD), $(CMD), python -m kvmd.apps.ipmi) \ && $(if $(CMD),$(CMD),python -m kvmd.apps.ipmi) \
" "
@ -108,7 +108,7 @@ release:
bump: bump:
bumpversion $(if $(V), $(V), minor) bumpversion $(if $(V),$(V),minor)
push: push: