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

install certs for tox

Browse Source
This commit is contained in:
Devaev Maxim 2021-02-12 05:53:46 +03:00
parent 44b636365b
commit 390f33953a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -52,6 +52,17 @@ testenv:
--build-arg LIBGPIOD_VERSION=$(LIBGPIOD_VERSION) \ --build-arg LIBGPIOD_VERSION=$(LIBGPIOD_VERSION) \
--build-arg USTREAMER_MIN_VERSION=$(USTREAMER_MIN_VERSION) \ --build-arg USTREAMER_MIN_VERSION=$(USTREAMER_MIN_VERSION) \
-f testenv/Dockerfile . -f testenv/Dockerfile .
test -d testenv/.ssl || docker run --rm \
--volume `pwd`:/src:ro \
--volume `pwd`/testenv:/src/testenv:rw \
-t $(TESTENV_IMAGE) bash -c " \
groupadd kvmd-nginx \
&& /src/scripts/kvmd-gencert --do-the-thing \
&& chown -R root:root /etc/kvmd/nginx/ssl \
&& chmod 664 /etc/kvmd/nginx/ssl/* \
&& chmod 775 /etc/kvmd/nginx/ssl \
&& mv /etc/kvmd/nginx/ssl /src/testenv/.ssl \
"
tox: testenv tox: testenv
@ -63,7 +74,8 @@ tox: testenv
--volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \ --volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \
--volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \ --volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \
-t $(TESTENV_IMAGE) bash -c " \ -t $(TESTENV_IMAGE) bash -c " \
cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ cp -a /src/testenv/.ssl /etc/kvmd/nginx/ssl \
&& 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 /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
&& cp /src/testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cp /src/testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
@ -79,17 +91,6 @@ $(TESTENV_GPIO):
run: testenv $(TESTENV_GPIO) run: testenv $(TESTENV_GPIO)
test -d testenv/.ssl || docker run --rm \
--volume `pwd`:/src:ro \
--volume `pwd`/testenv:/src/testenv:rw \
-t $(TESTENV_IMAGE) bash -c " \
groupadd kvmd-nginx \
&& /src/scripts/kvmd-gencert --do-the-thing \
&& chown -R root:root /etc/kvmd/nginx/ssl \
&& chmod 664 /etc/kvmd/nginx/ssl/* \
&& chmod 775 /etc/kvmd/nginx/ssl \
&& mv /etc/kvmd/nginx/ssl /src/testenv/.ssl \
"
- docker run --rm --name kvmd \ - docker run --rm --name kvmd \
--cap-add SYS_ADMIN \ --cap-add SYS_ADMIN \
--volume `pwd`/testenv/run:/run/kvmd:rw \ --volume `pwd`/testenv/run:/run/kvmd:rw \
@ -170,10 +171,10 @@ run-vnc: testenv
--volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \ --volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \
--publish 5900:5900/tcp \ --publish 5900:5900/tcp \
-it $(TESTENV_IMAGE) /bin/bash -c " \ -it $(TESTENV_IMAGE) /bin/bash -c " \
cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ cp -a /testenv/.ssl /etc/kvmd/nginx/ssl \
&& 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 /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
&& cp -a /testenv/.ssl /etc/kvmd/nginx/ssl \
&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
&& $(if $(CMD),$(CMD),python -m kvmd.apps.vnc --run) \ && $(if $(CMD),$(CMD),python -m kvmd.apps.vnc --run) \
" "